From 454aeece1435622f283cb2443f218b5f7bd5de66 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 25 Aug 2005 16:27:28 +0000 Subject: [PATCH] Large patch from Ulrich Eckhardt to fix support for EVC++ 4. [SVN r30670] --- include/boost/archive/impl/basic_binary_iarchive.ipp | 2 +- include/boost/archive/impl/basic_text_iarchive.ipp | 2 +- include/boost/archive/impl/basic_xml_grammar.hpp | 6 +++--- include/boost/serialization/detail/shared_ptr_132.hpp | 4 ++-- include/boost/serialization/nvp.hpp | 2 +- src/basic_serializer_map.cpp | 2 +- src/basic_text_iprimitive.cpp | 2 +- src/basic_text_oprimitive.cpp | 2 +- src/basic_text_wiprimitive.cpp | 2 +- src/basic_text_woprimitive.cpp | 2 +- src/basic_xml_grammar.ipp | 2 +- src/polymorphic_iarchive.cpp | 2 +- src/polymorphic_oarchive.cpp | 2 +- src/stl_port.cpp | 2 +- src/text_oarchive.cpp | 2 +- src/void_cast.cpp | 2 +- src/xml_grammar.cpp | 2 +- src/xml_iarchive.cpp | 2 +- src/xml_oarchive.cpp | 2 +- src/xml_wiarchive.cpp | 2 +- test/test_iterators_base64.cpp | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/boost/archive/impl/basic_binary_iarchive.ipp b/include/boost/archive/impl/basic_binary_iarchive.ipp index 3ff8bfca..2a2d3dd6 100644 --- a/include/boost/archive/impl/basic_binary_iarchive.ipp +++ b/include/boost/archive/impl/basic_binary_iarchive.ipp @@ -63,7 +63,7 @@ basic_binary_iarchive::init(){ #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205)) this->set_library_version(input_library_version); #else - #if ! BOOST_WORKAROUND(BOOST_MSVC, <= 1200) + #if ! BOOST_WORKAROUND(BOOST_MSVC, < 1300) detail:: #endif basic_iarchive::set_library_version(input_library_version); diff --git a/include/boost/archive/impl/basic_text_iarchive.ipp b/include/boost/archive/impl/basic_text_iarchive.ipp index 97ec1226..567132e9 100644 --- a/include/boost/archive/impl/basic_text_iarchive.ipp +++ b/include/boost/archive/impl/basic_text_iarchive.ipp @@ -63,7 +63,7 @@ basic_text_iarchive::init(void){ #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205)) this->set_library_version(input_library_version); #else - #if ! BOOST_WORKAROUND(BOOST_MSVC, <= 1200) + #if ! BOOST_WORKAROUND(BOOST_MSVC, < 1300) detail:: #endif basic_iarchive::set_library_version(input_library_version.t); diff --git a/include/boost/archive/impl/basic_xml_grammar.hpp b/include/boost/archive/impl/basic_xml_grammar.hpp index 071d6c03..20c0f330 100644 --- a/include/boost/archive/impl/basic_xml_grammar.hpp +++ b/include/boost/archive/impl/basic_xml_grammar.hpp @@ -51,7 +51,7 @@ #include // supress noise -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif @@ -62,13 +62,13 @@ // the following hack is to evade a bogus error generated by using the // word "arg" when bind.hpp has been included -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) #define arg xarg #endif #include -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) #undef arg #endif diff --git a/include/boost/serialization/detail/shared_ptr_132.hpp b/include/boost/serialization/detail/shared_ptr_132.hpp index 0e0bceca..31802dbd 100644 --- a/include/boost/serialization/detail/shared_ptr_132.hpp +++ b/include/boost/serialization/detail/shared_ptr_132.hpp @@ -212,7 +212,7 @@ public: #endif -#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200) +#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1300) template shared_ptr & operator=(shared_ptr const & r) // never throws @@ -435,7 +435,7 @@ template std::ostream & operator<< (std::ostream & os, shared_ptr co #else -# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200 && __SGI_STL_PORT) +# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 && __SGI_STL_PORT) // MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL using std::basic_ostream; template basic_ostream & operator<< (basic_ostream & os, shared_ptr const & p) diff --git a/include/boost/serialization/nvp.hpp b/include/boost/serialization/nvp.hpp index c6b3e7e0..9570493a 100644 --- a/include/boost/serialization/nvp.hpp +++ b/include/boost/serialization/nvp.hpp @@ -21,7 +21,7 @@ #include #include // supress noise -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/basic_serializer_map.cpp b/src/basic_serializer_map.cpp index 2ef46bd7..28a80cae 100644 --- a/src/basic_serializer_map.cpp +++ b/src/basic_serializer_map.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/basic_text_iprimitive.cpp b/src/basic_text_iprimitive.cpp index c67a9420..2b2a0f24 100644 --- a/src/basic_text_iprimitive.cpp +++ b/src/basic_text_iprimitive.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/basic_text_oprimitive.cpp b/src/basic_text_oprimitive.cpp index d8d98d69..e26e709f 100644 --- a/src/basic_text_oprimitive.cpp +++ b/src/basic_text_oprimitive.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/basic_text_wiprimitive.cpp b/src/basic_text_wiprimitive.cpp index 4797485b..ad2af766 100644 --- a/src/basic_text_wiprimitive.cpp +++ b/src/basic_text_wiprimitive.cpp @@ -14,7 +14,7 @@ #error "wide char i/o not supported on this platform" #else -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/basic_text_woprimitive.cpp b/src/basic_text_woprimitive.cpp index e13294e7..654a79bb 100644 --- a/src/basic_text_woprimitive.cpp +++ b/src/basic_text_woprimitive.cpp @@ -14,7 +14,7 @@ #error "wide char i/o not supported on this platform" #else -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/basic_xml_grammar.ipp b/src/basic_xml_grammar.ipp index 6b8fd641..fe802bf3 100644 --- a/src/basic_xml_grammar.ipp +++ b/src/basic_xml_grammar.ipp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/polymorphic_iarchive.cpp b/src/polymorphic_iarchive.cpp index e3f85224..a8531a1d 100644 --- a/src/polymorphic_iarchive.cpp +++ b/src/polymorphic_iarchive.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/polymorphic_oarchive.cpp b/src/polymorphic_oarchive.cpp index a98172d6..c649285b 100644 --- a/src/polymorphic_oarchive.cpp +++ b/src/polymorphic_oarchive.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/stl_port.cpp b/src/stl_port.cpp index 298cdfa0..82ab1818 100644 --- a/src/stl_port.cpp +++ b/src/stl_port.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/text_oarchive.cpp b/src/text_oarchive.cpp index 1d802844..9879bc52 100644 --- a/src/text_oarchive.cpp +++ b/src/text_oarchive.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/void_cast.cpp b/src/void_cast.cpp index 72c2c82c..9765e061 100644 --- a/src/void_cast.cpp +++ b/src/void_cast.cpp @@ -9,7 +9,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/xml_grammar.cpp b/src/xml_grammar.cpp index 4a31ed90..3d137214 100644 --- a/src/xml_grammar.cpp +++ b/src/xml_grammar.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/xml_iarchive.cpp b/src/xml_iarchive.cpp index c5298275..5f18f2bd 100644 --- a/src/xml_iarchive.cpp +++ b/src/xml_iarchive.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/xml_oarchive.cpp b/src/xml_oarchive.cpp index cf9456b5..1908f4be 100644 --- a/src/xml_oarchive.cpp +++ b/src/xml_oarchive.cpp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/src/xml_wiarchive.cpp b/src/xml_wiarchive.cpp index 8957e0f2..1c2dd307 100644 --- a/src/xml_wiarchive.cpp +++ b/src/xml_wiarchive.cpp @@ -15,7 +15,7 @@ #include -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif diff --git a/test/test_iterators_base64.cpp b/test/test_iterators_base64.cpp index aebe18af..c3b8622f 100644 --- a/test/test_iterators_base64.cpp +++ b/test/test_iterators_base64.cpp @@ -9,7 +9,7 @@ #include #include -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif