BOOST_PYTHON_EXPORT -> BOOST_PYTHON_DECL

dabrahams · dabrahams · commit e934be2d9912 · 2002-01-01T18:21:31.000Z
[SVN r12187]
diff --git a/src/converter/type_id.cpp b/src/converter/type_id.cpp
@@ -19,7 +19,7 @@ bool type_id_before::operator()(type_id_t const& x, type_id_t const&  y) const
     return x < y;
 }
 
-BOOST_PYTHON_EXPORT std::ostream& operator<<(std::ostream& os, type_id_t const& x)
+BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream& os, type_id_t const& x)
 {
 #  ifdef BOOST_PYTHON_TYPE_ID_NAME
     os << x.m_base_type;
diff --git a/src/object/class.cpp b/src/object/class.cpp
@@ -4,7 +4,7 @@
 // "as is" without express or implied warranty, and with no claim as
 // to its suitability for any purpose.
 
-#include <boost/python/export.hpp>
+#include <boost/python/detail/config.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/detail/wrap_python.hpp>
 #include <boost/python/object/class.hpp>
@@ -23,7 +23,6 @@ holder_base::~holder_base()
 {
 }
 
-//BOOST_PYTHON_EXPORT
 PyTypeObject class_metatype_object = {
     PyObject_HEAD_INIT(0)//&PyType_Type)
         0,
@@ -68,7 +67,6 @@ PyTypeObject class_metatype_object = {
         // PyType_GenericNew                       /* tp_new */
 };
 
-//BOOST_PYTHON_EXPORT
 PyTypeObject class_type_object = {
     PyObject_HEAD_INIT(0) //&class_metatype_object)
         0,
@@ -112,7 +110,7 @@ PyTypeObject class_type_object = {
         PyType_GenericNew
 };
 
-BOOST_PYTHON_EXPORT PyTypeObject* class_metatype()
+BOOST_PYTHON_DECL PyTypeObject* class_metatype()
 {
     if (class_metatype_object.tp_dict == 0)
     {
@@ -125,7 +123,7 @@ BOOST_PYTHON_EXPORT PyTypeObject* class_metatype()
     return &class_metatype_object;
 }
 
-BOOST_PYTHON_EXPORT PyTypeObject* class_type()
+BOOST_PYTHON_DECL PyTypeObject* class_type()
 {
     if (class_type_object.tp_dict == 0)
     {
@@ -145,7 +143,7 @@ void holder_base::install(PyObject* self)
     ((instance*)self)->objects = this;
 }
 
-BOOST_PYTHON_EXPORT holder_base*
+BOOST_PYTHON_DECL holder_base*
 find_holder_impl(PyObject* inst, converter::type_id_t type)
 {
     if (inst->ob_type->ob_type != &class_metatype_object)

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ bool type_id_before::operator()(type_id_t const& x, type_id_t const& y) const`
`19`	`19`	`return x < y;`
`20`	`20`	`}`
`21`	`21`
`22`		`-BOOST_PYTHON_EXPORT std::ostream& operator<<(std::ostream& os, type_id_t const& x)`
	`22`	`+BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream& os, type_id_t const& x)`
`23`	`23`	`{`
`24`	`24`	`# ifdef BOOST_PYTHON_TYPE_ID_NAME`
`25`	`25`	`os << x.m_base_type;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`// "as is" without express or implied warranty, and with no claim as`
`5`	`5`	`// to its suitability for any purpose.`
`6`	`6`
`7`		`-#include <boost/python/export.hpp>`
	`7`	`+#include <boost/python/detail/config.hpp>`
`8`	`8`	`#include <boost/python/module.hpp>`
`9`	`9`	`#include <boost/python/detail/wrap_python.hpp>`
`10`	`10`	`#include <boost/python/object/class.hpp>`
`@@ -23,7 +23,6 @@ holder_base::~holder_base()`
`23`	`23`	`{`
`24`	`24`	`}`
`25`	`25`
`26`		`-//BOOST_PYTHON_EXPORT`
`27`	`26`	`PyTypeObject class_metatype_object = {`
`28`	`27`	`PyObject_HEAD_INIT(0)//&PyType_Type)`
`29`	`28`	`0,`
`@@ -68,7 +67,6 @@ PyTypeObject class_metatype_object = {`
`68`	`67`	`// PyType_GenericNew /* tp_new */`
`69`	`68`	`};`
`70`	`69`
`71`		`-//BOOST_PYTHON_EXPORT`
`72`	`70`	`PyTypeObject class_type_object = {`
`73`	`71`	`PyObject_HEAD_INIT(0) //&class_metatype_object)`
`74`	`72`	`0,`
`@@ -112,7 +110,7 @@ PyTypeObject class_type_object = {`
`112`	`110`	`PyType_GenericNew`
`113`	`111`	`};`
`114`	`112`
`115`		`-BOOST_PYTHON_EXPORT PyTypeObject* class_metatype()`
	`113`	`+BOOST_PYTHON_DECL PyTypeObject* class_metatype()`
`116`	`114`	`{`
`117`	`115`	`if (class_metatype_object.tp_dict == 0)`
`118`	`116`	`{`
`@@ -125,7 +123,7 @@ BOOST_PYTHON_EXPORT PyTypeObject* class_metatype()`
`125`	`123`	`return &class_metatype_object;`
`126`	`124`	`}`
`127`	`125`
`128`		`-BOOST_PYTHON_EXPORT PyTypeObject* class_type()`
	`126`	`+BOOST_PYTHON_DECL PyTypeObject* class_type()`
`129`	`127`	`{`
`130`	`128`	`if (class_type_object.tp_dict == 0)`
`131`	`129`	`{`
`@@ -145,7 +143,7 @@ void holder_base::install(PyObject* self)`
`145`	`143`	`((instance*)self)->objects = this;`
`146`	`144`	`}`
`147`	`145`
`148`		`-BOOST_PYTHON_EXPORT holder_base*`
	`146`	`+BOOST_PYTHON_DECL holder_base*`
`149`	`147`	`find_holder_impl(PyObject* inst, converter::type_id_t type)`
`150`	`148`	`{`
`151`	`149`	`if (inst->ob_type->ob_type != &class_metatype_object)`