From e934be2d991249f2bf18ce58a520e40ef8abb113 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Tue, 1 Jan 2002 18:21:31 +0000 Subject: [PATCH] BOOST_PYTHON_EXPORT -> BOOST_PYTHON_DECL [SVN r12187] --- src/converter/type_id.cpp | 2 +- src/object/class.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/converter/type_id.cpp b/src/converter/type_id.cpp index 86974638..fc2db66a 100644 --- 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 index cc3903e3..bdd66a77 100644 --- 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 +#include #include #include #include @@ -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)