Skip to content

Commit a179f87

Browse files
dabrahamsdabrahams
committed
BOOST_PYTHON_EXPORT -> BOOST_PYTHON_DECL
[SVN r12192]
1 parent b2944a1 commit a179f87

7 files changed

Lines changed: 23 additions & 27 deletions

File tree

‎include/boost/python/converter/body.hpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55
// to its suitability for any purpose.
66
#ifndef BODY_DWA2001127_HPP
77
# define BODY_DWA2001127_HPP
8-
# include <boost/config.hpp>
8+
# include <boost/python/detail/config.hpp>
99
# include <boost/python/converter/type_id.hpp>
10-
# include <boost/python/export.hpp>
1110

1211
namespace boost { namespace python { namespace converter {
1312

14-
struct BOOST_PYTHON_EXPORT handle;
13+
struct BOOST_PYTHON_DECL handle;
1514

1615
namespace registry
1716
{
1817
class entry;
1918
}
2019

21-
struct BOOST_PYTHON_EXPORT body
20+
struct BOOST_PYTHON_DECL body
2221
{
2322
public:
2423
body(type_id_t key);

‎include/boost/python/converter/handle.hpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55
// to its suitability for any purpose.
66
#ifndef HANDLE_DWA20011130_HPP
77
# define HANDLE_DWA20011130_HPP
8-
# include <boost/python/export.hpp>
8+
# include <boost/python/detail/config.hpp>
99
# include <boost/utility.hpp>
1010
# include <boost/python/detail/wrap_python.hpp>
11-
# include <boost/python/export.hpp>
1211

1312
namespace boost { namespace python { namespace converter {
1413

15-
struct BOOST_PYTHON_EXPORT body;
14+
struct BOOST_PYTHON_DECL body;
1615

1716
// The common base class for unwrap_ and wrap_ handle objects. They
1817
// share a common base so that handles can be linked into a chain
1918
// within a function wrapper which is managed by a single object.
20-
struct BOOST_PYTHON_EXPORT handle : boost::noncopyable
19+
struct BOOST_PYTHON_DECL handle : boost::noncopyable
2120
{
2221
public: // member functions
2322

‎include/boost/python/converter/type_id.hpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
// to its suitability for any purpose.
66
#ifndef TYPE_ID_DWA20011127_HPP
77
# define TYPE_ID_DWA20011127_HPP
8-
# include <boost/config.hpp>
9-
# include <boost/python/export.hpp>
8+
# include <boost/python/detail/config.hpp>
9+
# include <boost/python/detail/config.hpp>
1010
# include <boost/mpl/select_type.hpp>
1111
# include <boost/type_traits/cv_traits.hpp>
1212
# include <boost/type_traits/composite_traits.hpp>
13-
# include <boost/python/export.hpp>
1413
# include <boost/operators.hpp>
1514
# include <typeinfo>
1615
# include <iosfwd>
@@ -48,7 +47,7 @@ typedef std::type_info const* base_id_t;
4847

4948
bool operator<(type_id_t const& rhs) const;
5049
bool operator==(type_id_t const& rhs) const;
51-
friend BOOST_PYTHON_EXPORT std::ostream& operator<<(std::ostream&, type_id_t const&);
50+
friend BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream&, type_id_t const&);
5251

5352
private:
5453
decoration m_decoration;
@@ -188,12 +187,12 @@ type_id_t type_id(detail::dummy<T>* = 0)
188187
}
189188
# endif
190189

191-
struct BOOST_PYTHON_EXPORT type_id_before
190+
struct BOOST_PYTHON_DECL type_id_before
192191
{
193192
bool operator()(type_id_t const& x, type_id_t const& y) const;
194193
};
195194

196-
BOOST_PYTHON_EXPORT std::ostream& operator<<(std::ostream&, type_id_t const&);
195+
BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream&, type_id_t const&);
197196

198197
}}} // namespace boost::python::converter
199198

‎include/boost/python/converter/wrap.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
# include <boost/python/converter/handle.hpp>
1010
# include <boost/python/converter/body.hpp>
1111
# include <boost/python/converter/wrapper.hpp>
12-
# include <boost/python/export.hpp>
12+
# include <boost/python/detail/config.hpp>
1313
# include <boost/python/converter/source_holder.hpp>
1414
# include <cassert>
1515

1616
namespace boost { namespace python { namespace converter {
1717

18-
struct BOOST_PYTHON_EXPORT wrapper_base;
18+
struct BOOST_PYTHON_DECL wrapper_base;
1919

2020
template <class T> struct wrapper;
2121

‎include/boost/python/converter/wrapper.hpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@
55
// to its suitability for any purpose.
66
#ifndef WRAPPER_DWA2001127_HPP
77
# define WRAPPER_DWA2001127_HPP
8-
# include <boost/config.hpp>
8+
# include <boost/python/detail/config.hpp>
99
# include <boost/python/detail/wrap_python.hpp>
1010
# include <boost/python/converter/body.hpp>
1111
# include <boost/python/converter/type_id.hpp>
1212
# include <boost/python/converter/wrap.hpp>
1313
# include <boost/python/converter/source_holder.hpp>
14-
# include <boost/python/export.hpp>
1514

1615
namespace boost { namespace python { namespace converter {
1716

1817
struct source_holder_base;
1918
struct wrap_base;
2019
template <class T> struct wrap_more_;
2120

22-
struct BOOST_PYTHON_EXPORT wrapper_base : body
21+
struct BOOST_PYTHON_DECL wrapper_base : body
2322
{
2423
public:
2524
wrapper_base(type_id_t); // registers

‎include/boost/python/object/class.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# define CLASS_DWA20011214_HPP
88

99
# include <boost/python/detail/wrap_python.hpp>
10-
# include <boost/python/export.hpp>
10+
# include <boost/python/detail/config.hpp>
1111
# include <boost/utility.hpp>
1212
# include <boost/python/converter/type_id.hpp>
1313
# include <boost/iterator_adaptors.hpp>
@@ -17,7 +17,7 @@ namespace boost { namespace python { namespace object {
1717
template <class T> struct holder;
1818

1919
// Base class for all holders
20-
struct BOOST_PYTHON_EXPORT holder_base : noncopyable
20+
struct BOOST_PYTHON_DECL holder_base : noncopyable
2121
{
2222
public:
2323
holder_base(converter::type_id_t id);
@@ -68,16 +68,16 @@ struct instance
6868
holder_base* objects;
6969
};
7070

71-
BOOST_PYTHON_EXPORT holder_base* find_holder_impl(PyObject*, converter::type_id_t);
71+
BOOST_PYTHON_DECL holder_base* find_holder_impl(PyObject*, converter::type_id_t);
7272

7373
template <class T>
7474
holder<T>* find_holder(PyObject* p, T* = 0)
7575
{
7676
return static_cast<holder<T>*>(find_holder_impl(p, converter::type_id<T>()));
7777
}
7878

79-
BOOST_PYTHON_EXPORT PyTypeObject* class_metatype();
80-
BOOST_PYTHON_EXPORT PyTypeObject* class_type();
79+
BOOST_PYTHON_DECL PyTypeObject* class_metatype();
80+
BOOST_PYTHON_DECL PyTypeObject* class_type();
8181

8282
//
8383
// implementation

‎include/boost/python/object/function.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
# define FUNCTION_DWA20011214_HPP
88

99
# include <boost/python/detail/wrap_python.hpp>
10-
# include <boost/python/export.hpp>
10+
# include <boost/python/detail/config.hpp>
1111
# include <boost/function.hpp>
1212

1313
namespace boost { namespace python { namespace object {
1414

1515
// We use boost::function to avoid generating lots of virtual tables
1616
typedef boost::function2<PyObject*, PyObject*, PyObject*> py_function;
1717

18-
struct BOOST_PYTHON_EXPORT function : PyObject
18+
struct BOOST_PYTHON_DECL function : PyObject
1919
{
2020
function(py_function);
2121
~function();
@@ -25,7 +25,7 @@ struct BOOST_PYTHON_EXPORT function : PyObject
2525
py_function m_fn;
2626
};
2727

28-
extern BOOST_PYTHON_EXPORT PyTypeObject function_type;
28+
extern BOOST_PYTHON_DECL PyTypeObject function_type;
2929

3030
//
3131
// implementations

0 commit comments

Comments
 (0)