diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 8d5affcae..2e74591a6 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -107,6 +107,7 @@ lib boost_serialization clang:"-ftemplate-depth-255" darwin:"-ftemplate-depth-255" shared:BOOST_SERIALIZATION_DYN_LINK=1 + BOOST_SERIALIZATION_SOURCE ; lib boost_wserialization diff --git a/src/basic_iarchive.cpp b/src/basic_iarchive.cpp index 841fefdd5..932716661 100644 --- a/src/basic_iarchive.cpp +++ b/src/basic_iarchive.cpp @@ -26,9 +26,6 @@ namespace std{ #include #define BOOST_ARCHIVE_SOURCE -// include this to prevent linker errors when the -// same modules are marked export and import. -#define BOOST_SERIALIZATION_SOURCE #include #include diff --git a/src/basic_oarchive.cpp b/src/basic_oarchive.cpp index 538be310a..c6be54903 100644 --- a/src/basic_oarchive.cpp +++ b/src/basic_oarchive.cpp @@ -19,9 +19,6 @@ // including this here to work around an ICC in intel 7.0 // normally this would be part of basic_oarchive.hpp below. #define BOOST_ARCHIVE_SOURCE -// include this to prevent linker errors when the -// same modules are marked export and import. -#define BOOST_SERIALIZATION_SOURCE #include #include #include diff --git a/src/basic_serializer_map.cpp b/src/basic_serializer_map.cpp index 5b7910772..3205c4e41 100644 --- a/src/basic_serializer_map.cpp +++ b/src/basic_serializer_map.cpp @@ -16,9 +16,6 @@ #include #define BOOST_ARCHIVE_SOURCE -// include this to prevent linker errors when the -// same modules are marked export and import. -#define BOOST_SERIALIZATION_SOURCE #include #include diff --git a/src/extended_type_info.cpp b/src/extended_type_info.cpp index 13a60c3e7..946be9d7e 100644 --- a/src/extended_type_info.cpp +++ b/src/extended_type_info.cpp @@ -27,10 +27,6 @@ namespace std{ using ::strcmp; } #include -// it marks our code with proper attributes as being exported when -// we're compiling it while marking it import when just the headers -// is being included. -#define BOOST_SERIALIZATION_SOURCE #include #include #include diff --git a/src/extended_type_info_no_rtti.cpp b/src/extended_type_info_no_rtti.cpp index 0a8d2a078..c0a118b8d 100644 --- a/src/extended_type_info_no_rtti.cpp +++ b/src/extended_type_info_no_rtti.cpp @@ -18,10 +18,6 @@ namespace std{ using ::strcmp; } #endif -// it marks our code with proper attributes as being exported when -// we're compiling it while marking it import when just the headers -// is being included. -#define BOOST_SERIALIZATION_SOURCE #include #include diff --git a/src/extended_type_info_typeid.cpp b/src/extended_type_info_typeid.cpp index 5669dfa77..fac778665 100644 --- a/src/extended_type_info_typeid.cpp +++ b/src/extended_type_info_typeid.cpp @@ -17,10 +17,6 @@ #include -// it marks our code with proper attributes as being exported when -// we're compiling it while marking it import when just the headers -// is being included. -#define BOOST_SERIALIZATION_SOURCE #include #include #include diff --git a/src/singleton.cpp b/src/singleton.cpp index 70855f60d..3484e8c4a 100644 --- a/src/singleton.cpp +++ b/src/singleton.cpp @@ -7,10 +7,6 @@ // http://www.boost.org/LICENSE_1_0.txt) // -// it marks our code with proper attributes as being exported when -// we're compiling it while marking it import when just the headers -// is being included. -#define BOOST_SERIALIZATION_SOURCE #include #include diff --git a/src/void_cast.cpp b/src/void_cast.cpp index 900999332..17a0f93ab 100644 --- a/src/void_cast.cpp +++ b/src/void_cast.cpp @@ -26,7 +26,6 @@ #include #include -#define BOOST_SERIALIZATION_SOURCE #include // it marks our code with proper attributes as being exported when // we're compiling it while marking it import when just the headers