From 2406780d7ffdff13267a8cc05761f3fa7ec07fe8 Mon Sep 17 00:00:00 2001 From: Robert Ramey Date: Wed, 8 Jun 2005 15:55:27 +0000 Subject: [PATCH] adjust declspec syntax for different compilers [SVN r29481] --- include/boost/archive/basic_archive.hpp | 2 +- include/boost/archive/basic_xml_archive.hpp | 16 ++++++++-------- .../detail/archive_pointer_iserializer.hpp | 2 +- .../detail/archive_pointer_oserializer.hpp | 2 +- .../archive/impl/archive_pointer_iserializer.ipp | 2 +- .../archive/impl/archive_pointer_oserializer.ipp | 2 +- src/basic_archive.cpp | 2 +- src/basic_iarchive.cpp | 6 +++--- src/basic_oarchive.cpp | 4 ++-- src/basic_serializer_map.cpp | 2 +- src/basic_xml_archive.cpp | 16 ++++++++-------- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/boost/archive/basic_archive.hpp b/include/boost/archive/basic_archive.hpp index dbcb7801..81f92724 100644 --- a/include/boost/archive/basic_archive.hpp +++ b/include/boost/archive/basic_archive.hpp @@ -98,7 +98,7 @@ enum archive_flags { #define NULL_POINTER_TAG class_id_type(-1) -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else diff --git a/include/boost/archive/basic_xml_archive.hpp b/include/boost/archive/basic_xml_archive.hpp index d0c0e702..47a7c886 100644 --- a/include/boost/archive/basic_xml_archive.hpp +++ b/include/boost/archive/basic_xml_archive.hpp @@ -62,7 +62,7 @@ public: // constant strings used in xml i/o extern -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -72,7 +72,7 @@ extern OBJECT_ID(); extern -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -82,7 +82,7 @@ extern OBJECT_REFERENCE(); extern -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -92,7 +92,7 @@ extern CLASS_ID(); extern -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -102,7 +102,7 @@ extern CLASS_ID_REFERENCE(); extern -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -112,7 +112,7 @@ extern CLASS_NAME(); extern -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -122,7 +122,7 @@ extern TRACKING(); extern -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -132,7 +132,7 @@ extern VERSION(); extern -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else diff --git a/include/boost/archive/detail/archive_pointer_iserializer.hpp b/include/boost/archive/detail/archive_pointer_iserializer.hpp index 52aa20b1..3c9bad00 100644 --- a/include/boost/archive/detail/archive_pointer_iserializer.hpp +++ b/include/boost/archive/detail/archive_pointer_iserializer.hpp @@ -70,7 +70,7 @@ public: // type_info. returns NULL if there is no such instance. This // would indicate that the no object of the specified type was loaded // any where in the code. - #if defined(BOOST_MSVC) + #if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE_OR_WARCHIVE static const basic_pointer_iserializer * #else diff --git a/include/boost/archive/detail/archive_pointer_oserializer.hpp b/include/boost/archive/detail/archive_pointer_oserializer.hpp index 78c3ab89..7b29eeef 100644 --- a/include/boost/archive/detail/archive_pointer_oserializer.hpp +++ b/include/boost/archive/detail/archive_pointer_oserializer.hpp @@ -44,7 +44,7 @@ public: // type_info. returns NULL, if there is no such instance. This // would indicate that the no object of the specified type was saved // any where in the code. - #if defined(BOOST_MSVC) + #if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE_OR_WARCHIVE static const basic_pointer_oserializer * #else diff --git a/include/boost/archive/impl/archive_pointer_iserializer.ipp b/include/boost/archive/impl/archive_pointer_iserializer.ipp index a7b265f4..9161bc30 100644 --- a/include/boost/archive/impl/archive_pointer_iserializer.ipp +++ b/include/boost/archive/impl/archive_pointer_iserializer.ipp @@ -37,7 +37,7 @@ archive_pointer_iserializer::archive_pointer_iserializer( template #if !defined(__BORLANDC__) - #if defined(BOOST_MSVC) + #if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE_OR_WARCHIVE const basic_pointer_iserializer * #else diff --git a/include/boost/archive/impl/archive_pointer_oserializer.ipp b/include/boost/archive/impl/archive_pointer_oserializer.ipp index 7bac71f9..e99a9823 100644 --- a/include/boost/archive/impl/archive_pointer_oserializer.ipp +++ b/include/boost/archive/impl/archive_pointer_oserializer.ipp @@ -38,7 +38,7 @@ archive_pointer_oserializer::archive_pointer_oserializer( template #if !defined(__BORLANDC__) - #if defined(BOOST_MSVC) + #if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE_OR_WARCHIVE const basic_pointer_oserializer * #else diff --git a/src/basic_archive.cpp b/src/basic_archive.cpp index f84d2d6e..776cc7e0 100644 --- a/src/basic_archive.cpp +++ b/src/basic_archive.cpp @@ -41,7 +41,7 @@ namespace archive { // constants used in archive signature //This should never ever change. note that is not an std::string // string. -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else diff --git a/src/basic_iarchive.cpp b/src/basic_iarchive.cpp index b721ab27..17b189a7 100644 --- a/src/basic_iarchive.cpp +++ b/src/basic_iarchive.cpp @@ -597,7 +597,7 @@ basic_iarchive::load_object( } // load a pointer object -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const basic_pointer_iserializer * #else @@ -639,7 +639,7 @@ basic_iarchive::get_flags() const{ return pimpl->m_flags; } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE boost::serialization::basic_helper * #else @@ -652,7 +652,7 @@ basic_iarchive::lookup_helper( return pimpl->lookup_helper(eti); } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE boost::serialization::basic_helper * #else diff --git a/src/basic_oarchive.cpp b/src/basic_oarchive.cpp index 7503cb2a..3e900399 100644 --- a/src/basic_oarchive.cpp +++ b/src/basic_oarchive.cpp @@ -503,7 +503,7 @@ BOOST_DECL_ARCHIVE basic_oarchive::end_preamble(){ } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE boost::serialization::basic_helper * #else @@ -516,7 +516,7 @@ basic_oarchive::lookup_helper( return pimpl->lookup_helper(eti); } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE boost::serialization::basic_helper * #else diff --git a/src/basic_serializer_map.cpp b/src/basic_serializer_map.cpp index 4a9b5b59..2f5097b7 100644 --- a/src/basic_serializer_map.cpp +++ b/src/basic_serializer_map.cpp @@ -42,7 +42,7 @@ public: {} }; -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const basic_serializer * #else diff --git a/src/basic_xml_archive.cpp b/src/basic_xml_archive.cpp index 0446dd5d..f3990e54 100644 --- a/src/basic_xml_archive.cpp +++ b/src/basic_xml_archive.cpp @@ -14,7 +14,7 @@ namespace boost { namespace archive { -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -24,7 +24,7 @@ BOOST_DECL_ARCHIVE OBJECT_ID(){ return "object_id"; } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -34,7 +34,7 @@ BOOST_DECL_ARCHIVE OBJECT_REFERENCE(){ return "object_id_reference"; } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -44,7 +44,7 @@ BOOST_DECL_ARCHIVE CLASS_ID(){ return "class_id"; } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -54,7 +54,7 @@ BOOST_DECL_ARCHIVE CLASS_ID_REFERENCE(){ return "class_id_reference"; } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -64,7 +64,7 @@ BOOST_DECL_ARCHIVE CLASS_NAME(){ return "class_name"; } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -74,7 +74,7 @@ BOOST_DECL_ARCHIVE TRACKING(){ return "tracking_level"; } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else @@ -84,7 +84,7 @@ BOOST_DECL_ARCHIVE VERSION(){ return "version"; } -#if defined(BOOST_MSVC) +#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN) || defined(__MWERKS__) BOOST_DECL_ARCHIVE const char * #else