Fix GCC export limiting patch from Niall Douglas s_sourceforge-at-nedprod.com

dabrahams · dabrahams · commit 5bab5a239876 · 2004-09-20T13:59:59.000Z
[SVN r25279]
diff --git a/include/boost/python/detail/config.hpp b/include/boost/python/detail/config.hpp
@@ -65,49 +65,44 @@
 #  define BOOST_PYTHON_DYNAMIC_LIB
 #endif
 
-#if defined(__MWERKS__) \
-  || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590002) \
-  || (defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
-# define BOOST_PYTHON_NO_TEMPLATE_EXPORT
-#endif
-
 #if defined(BOOST_PYTHON_DYNAMIC_LIB)
-#  if (defined(_WIN32) || defined(__CYGWIN__))
+
+#  if !defined(_WIN32) && !defined(__CYGWIN__)                  \
+    && defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >=5 \
+    && !defined(BOOST_PYTHON_GCC_SYMBOL_VISIBILITY)
+#    define BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY
+#  endif 
+
+#  if defined(BOOST_PYTHON_USE_GCC_SYMBOL_VISIBILITY)
 #     if defined(BOOST_PYTHON_SOURCE)
-#        define BOOST_PYTHON_DECL __declspec(dllexport)
+#        define BOOST_PYTHON_DECL __attribute__ ((visibility("default")))
 #        define BOOST_PYTHON_BUILD_DLL
 #     else
-#        define BOOST_PYTHON_DECL __declspec(dllimport)
+#        define BOOST_PYTHON_DECL
 #     endif
-#  elif (defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >=5)
+#     define BOOST_PYTHON_DECL_FORWARD
+#     define BOOST_PYTHON_DECL_EXCEPTION __attribute__ ((visibility("default")))
+#  elif (defined(_WIN32) || defined(__CYGWIN__))
 #     if defined(BOOST_PYTHON_SOURCE)
-#        define BOOST_PYTHON_DECL __attribute__ ((visibility("default")))
+#        define BOOST_PYTHON_DECL __declspec(dllexport)
 #        define BOOST_PYTHON_BUILD_DLL
-#        define BOOST_PYTHON_NODECL_DECLARATIONS
 #     else
-#        define BOOST_PYTHON_DECL
+#        define BOOST_PYTHON_DECL __declspec(dllimport)
 #     endif
 #  endif
 
-// MinGW, at least, has some problems exporting template instantiations
-#  if defined(__GNUC__) && __GNUC__ < 3 && !defined(__CYGWIN__)
-#   define BOOST_PYTHON_NO_TEMPLATE_EXPORT
-#  endif
-
 #endif
 
 #ifndef BOOST_PYTHON_DECL
 #  define BOOST_PYTHON_DECL
 #endif
 
-#ifndef BOOST_PYTHON_EXPORT
-# define BOOST_PYTHON_EXPORT extern
-#endif 
+#ifndef BOOST_PYTHON_DECL_FORWARD
+#  define BOOST_PYTHON_DECL_FORWARD BOOST_PYTHON_DECL
+#endif
 
-#if !defined(BOOST_PYTHON_NO_TEMPLATE_EXPORT)
-# define BOOST_PYTHON_EXPORT_CLASS_TEMPLATE(instantiation) BOOST_PYTHON_EXPORT template class BOOST_PYTHON_DECL instantiation
-#else
-# define BOOST_PYTHON_EXPORT_CLASS_TEMPLATE(instantiation) struct ThIsTyPeNeVeRuSeD
+#ifndef BOOST_PYTHON_DECL_EXCEPTION
+#  define BOOST_PYTHON_DECL_EXCEPTION BOOST_PYTHON_DECL
 #endif
 
 #if (defined(__DECCXX_VER) && __DECCXX_VER <= 60590041)
diff --git a/include/boost/python/errors.hpp b/include/boost/python/errors.hpp
@@ -14,9 +14,9 @@
 
 namespace boost { namespace python {
 
-struct BOOST_PYTHON_DECL error_already_set
+struct BOOST_PYTHON_DECL_EXCEPTION error_already_set
 {
-    virtual ~error_already_set();
+  virtual ~error_already_set();
 };
 
 // Handles exceptions caught just before returning to Python code.
diff --git a/include/boost/python/object/instance.hpp b/include/boost/python/object/instance.hpp
@@ -11,12 +11,7 @@
 
 namespace boost { namespace python
 {
-#ifdef BOOST_PYTHON_NODECL_DECLARATIONS
-  // Only declaring with BOOST_PYTHON_DECL makes no sense on GCC
-  struct instance_holder;
-#else
-  struct BOOST_PYTHON_DECL instance_holder;
-#endif
+  struct BOOST_PYTHON_DECL_FORWARD instance_holder;
 }} // namespace boost::python
 
 namespace boost { namespace python { namespace objects { 

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@`
`14`	`14`
`15`	`15`	`namespace boost { namespace python {`
`16`	`16`
`17`		`-struct BOOST_PYTHON_DECL error_already_set`
	`17`	`+struct BOOST_PYTHON_DECL_EXCEPTION error_already_set`
`18`	`18`	`{`
`19`		`- virtual ~error_already_set();`
	`19`	`+ virtual ~error_already_set();`
`20`	`20`	`};`
`21`	`21`
`22`	`22`	`// Handles exceptions caught just before returning to Python code.`