From 3864838da211ab5c2620bea1d440cebc9fe62148 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Wed, 19 Oct 2005 22:02:51 +0000
Subject: [PATCH] Fixed for vc6

[SVN r31398]
---
 include/boost/python/object/class_metadata.hpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/boost/python/object/class_metadata.hpp b/include/boost/python/object/class_metadata.hpp
index 212abfe4..bf0e2748 100755
--- a/include/boost/python/object/class_metadata.hpp
+++ b/include/boost/python/object/class_metadata.hpp
@@ -53,7 +53,11 @@ struct register_base_of
     template <class Base>
     inline void operator()(Base*) const
     {
+# if !BOOST_WORKAROUND(BOOST_MSVC, == 1200)
         BOOST_MPL_ASSERT_NOT((is_same<Base,Derived>));
+# else
+        BOOST_STATIC_ASSERT(!(is_same<Base,Derived>::value));
+# endif 
         
         // Register the Base class
         register_dynamic_id<Base>();
@@ -205,7 +209,8 @@ struct class_metadata
     template <class T2>
     inline static void register_aux(python::wrapper<T2>*) 
     {
-        class_metadata::register_aux2((T2*)0, mpl::true_());
+        typedef typename mpl::not_<is_same<T2,wrapped> >::type use_callback;
+        class_metadata::register_aux2((T2*)0, use_callback());
     }
 
     inline static void register_aux(void*) 
@@ -248,6 +253,7 @@ struct class_metadata
     //
     inline static void maybe_register_class_to_python(void*, mpl::true_) {}
     
+
     template <class T2>
     inline static void maybe_register_class_to_python(T2*, mpl::false_)
     {
@@ -259,8 +265,6 @@ struct class_metadata
     //
     inline static void maybe_register_callback_class(void*, mpl::false_) {}
 
-    inline static void maybe_register_callback_class(wrapped*, mpl::true_) {}
-
     template <class T2>
     inline static void maybe_register_callback_class(T2*, mpl::true_)
     {