Take typeid(T&) rather than typeid(T). For some some compilers won't

dabrahams · dabrahams · commit 432d4782a5e7 · 2005-05-18T01:34:35.000Z
let you get away with typeid(T) when T is an incomplete class
type (that's conforming behavior), but GCC at least will allow
typeid(T&amp;) -- also disallowed by the standard when T is incomplete.
If it turns out that EDGs also barf on typeid(T&amp;), we may have more
work to do.

Some warning suppression for MSVC.


[SVN r29020]
diff --git a/include/boost/python/converter/registered.hpp b/include/boost/python/converter/registered.hpp
@@ -81,7 +81,7 @@ namespace detail
   registry_lookup(T&(*)())
   {
       detail::register_shared_ptr1((T*)0);
-      return registry::lookup(type_id<T>());
+      return registry::lookup(type_id<T&>());
   }
 
   template <class T>
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
@@ -74,8 +74,15 @@ namespace
 
           // Get the location in which to construct
           void* storage = ((rvalue_from_python_storage<T>*)data)->storage.bytes;
-          new (storage) T(SlotPolicy::extract(intermediate.get()));
-
+# ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable:4244)
+# endif 
+          new (storage) T( SlotPolicy::extract(intermediate.get()) );
+          
+# ifdef _MSC_VER
+#  pragma warning(pop)
+# endif 
           // record successful construction
           data->convertible = storage;
       }
diff --git a/test/module_tail.cpp b/test/module_tail.cpp
@@ -15,6 +15,7 @@
 # ifdef _MSC_VER
 #  pragma warning(push)
 #  pragma warning(disable:4297)
+#  pragma warning(disable:4535)
 extern "C" void straight_to_debugger(unsigned int, EXCEPTION_POINTERS*)
 {
     throw;
diff --git a/test/opaque.cpp b/test/opaque.cpp
@@ -7,16 +7,8 @@
 # include <boost/python/module.hpp>
 # include <boost/python/return_value_policy.hpp>
 
-# if BOOST_WORKAROUND(__GNUC__, == 2) \
-    || BOOST_WORKAROUND(__GNUC__, BOOST_TESTED_AT(3)) \
-       && BOOST_WORKAROUND(__GNUC_MINOR__, BOOST_TESTED_AT(3)) \
-       && BOOST_WORKAROUND(__GNUC_PATCHLEVEL__, BOOST_TESTED_AT(3))
-typedef struct opaque_ {} *opaque;
-typedef struct opaque2_ {} *opaque2;
-# else 
 typedef struct opaque_ *opaque;
 typedef struct opaque2_ *opaque2;
-# endif 
 
 opaque the_op   = ((opaque) 0x47110815);
 opaque2 the_op2 = ((opaque2) 0x08154711);

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ namespace detail`
`81`	`81`	`registry_lookup(T&(*)())`
`82`	`82`	`{`
`83`	`83`	`detail::register_shared_ptr1((T*)0);`
`84`		`- return registry::lookup(type_id<T>());`
	`84`	`+ return registry::lookup(type_id<T&>());`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`template <class T>`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`# ifdef _MSC_VER`
`16`	`16`	`# pragma warning(push)`
`17`	`17`	`# pragma warning(disable:4297)`
	`18`	`+# pragma warning(disable:4535)`
`18`	`19`	`extern "C" void straight_to_debugger(unsigned int, EXCEPTION_POINTERS*)`
`19`	`20`	`{`
`20`	`21`	`throw;`