Fix MSVC6 duplicate comdat (LNK1179) with multiple python::range instances

Raoouul · Raoouul · commit feff7bccd398 · 2003-11-12T16:50:17.000Z
[SVN r20794]
diff --git a/include/boost/python/converter/shared_ptr_from_python.hpp b/include/boost/python/converter/shared_ptr_from_python.hpp
@@ -19,7 +19,6 @@ struct shared_ptr_from_python
         converter::registry::insert(&convertible, &construct, type_id<shared_ptr<T> >());
     }
 
-    static shared_ptr_from_python const registration;
  private:
     static void* convertible(PyObject* p)
     {
@@ -45,9 +44,6 @@ struct shared_ptr_from_python
     }
 };
 
-template <class T>
-shared_ptr_from_python<T> const shared_ptr_from_python<T>::registration;
-
 }}} // namespace boost::python::converter
 
 #endif // SHARED_PTR_FROM_PYTHON_DWA20021130_HPP
diff --git a/include/boost/python/object/class_converters.hpp b/include/boost/python/object/class_converters.hpp
@@ -18,6 +18,8 @@
 
 # include <boost/mpl/for_each.hpp>
 
+# include <boost/detail/workaround.hpp>
+
 namespace boost { namespace python { namespace objects { 
 
 //////////////////////////////////////////////////////////////////////
@@ -76,8 +78,9 @@ struct register_base_of
 template <class Derived, class Bases>
 inline void register_class_from_python(Derived* = 0, Bases* = 0)
 {
-    python::detail::force_instantiate(converter::shared_ptr_from_python<Derived>::registration);
-    
+    // Static object constructor performs registration
+    static converter::shared_ptr_from_python<Derived> shared_ptr_registration;
+
     // register all up/downcasts here
     register_dynamic_id<Derived>();
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ struct shared_ptr_from_python`
`19`	`19`	`converter::registry::insert(&convertible, &construct, type_id<shared_ptr<T> >());`
`20`	`20`	`}`
`21`	`21`
`22`		`- static shared_ptr_from_python const registration;`
`23`	`22`	`private:`
`24`	`23`	`static void* convertible(PyObject* p)`
`25`	`24`	`{`
`@@ -45,9 +44,6 @@ struct shared_ptr_from_python`
`45`	`44`	`}`
`46`	`45`	`};`
`47`	`46`
`48`		`-template <class T>`
`49`		`-shared_ptr_from_python<T> const shared_ptr_from_python<T>::registration;`
`50`		`-`
`51`	`47`	`}}} // namespace boost::python::converter`
`52`	`48`
`53`	`49`	`#endif // SHARED_PTR_FROM_PYTHON_DWA20021130_HPP`