From f3d5bc52bbc31f2bcafa0c62093434c7c980dfef Mon Sep 17 00:00:00 2001 From: Robert Ramey Date: Wed, 12 Mar 2014 20:58:08 -0700 Subject: [PATCH] attempt to make tests pass on mdvc 8.0 --- include/boost/archive/basic_binary_iarchive.hpp | 4 ++-- include/boost/archive/basic_binary_oarchive.hpp | 4 ++-- include/boost/archive/basic_text_iarchive.hpp | 4 ++-- include/boost/archive/basic_text_oarchive.hpp | 4 ++-- include/boost/archive/basic_xml_iarchive.hpp | 4 ++-- include/boost/archive/basic_xml_oarchive.hpp | 6 +++--- include/boost/archive/binary_iarchive_impl.hpp | 4 ++-- include/boost/archive/binary_oarchive_impl.hpp | 4 ++-- include/boost/archive/text_iarchive.hpp | 4 ++-- include/boost/archive/text_oarchive.hpp | 4 ++-- include/boost/archive/text_wiarchive.hpp | 4 ++-- include/boost/archive/text_woarchive.hpp | 4 ++-- include/boost/archive/xml_iarchive.hpp | 4 ++-- include/boost/archive/xml_oarchive.hpp | 4 ++-- include/boost/archive/xml_wiarchive.hpp | 4 ++-- include/boost/archive/xml_woarchive.hpp | 4 ++-- include/boost/serialization/shared_ptr_helper.hpp | 4 ++-- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/include/boost/archive/basic_binary_iarchive.hpp b/include/boost/archive/basic_binary_iarchive.hpp index df93d2bb..06c88827 100644 --- a/include/boost/archive/basic_binary_iarchive.hpp +++ b/include/boost/archive/basic_binary_iarchive.hpp @@ -58,9 +58,9 @@ class basic_binary_iarchive : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_iarchive; #else friend class detail::interface_iarchive; diff --git a/include/boost/archive/basic_binary_oarchive.hpp b/include/boost/archive/basic_binary_oarchive.hpp index 468d1c5c..e96c4797 100644 --- a/include/boost/archive/basic_binary_oarchive.hpp +++ b/include/boost/archive/basic_binary_oarchive.hpp @@ -66,9 +66,9 @@ class basic_binary_oarchive : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_oarchive; #else friend class detail::interface_oarchive; diff --git a/include/boost/archive/basic_text_iarchive.hpp b/include/boost/archive/basic_text_iarchive.hpp index 6ba54d2e..d43762cb 100644 --- a/include/boost/archive/basic_text_iarchive.hpp +++ b/include/boost/archive/basic_text_iarchive.hpp @@ -54,9 +54,9 @@ class basic_text_iarchive : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_iarchive; #else friend class detail::interface_iarchive; diff --git a/include/boost/archive/basic_text_oarchive.hpp b/include/boost/archive/basic_text_oarchive.hpp index e54c7edf..e56fe03d 100644 --- a/include/boost/archive/basic_text_oarchive.hpp +++ b/include/boost/archive/basic_text_oarchive.hpp @@ -56,9 +56,9 @@ class basic_text_oarchive : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_oarchive; #else friend class detail::interface_oarchive; diff --git a/include/boost/archive/basic_xml_iarchive.hpp b/include/boost/archive/basic_xml_iarchive.hpp index cfd9c4ba..59462f54 100644 --- a/include/boost/archive/basic_xml_iarchive.hpp +++ b/include/boost/archive/basic_xml_iarchive.hpp @@ -51,9 +51,9 @@ class basic_xml_iarchive : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_iarchive; #else friend class detail::interface_iarchive; diff --git a/include/boost/archive/basic_xml_oarchive.hpp b/include/boost/archive/basic_xml_oarchive.hpp index 58d6495b..c6a9acbd 100644 --- a/include/boost/archive/basic_xml_oarchive.hpp +++ b/include/boost/archive/basic_xml_oarchive.hpp @@ -46,14 +46,14 @@ template class basic_xml_oarchive : public detail::common_oarchive { -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) +#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS public: #else protected: #endif -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) +#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_oarchive; #else friend class detail::interface_oarchive; diff --git a/include/boost/archive/binary_iarchive_impl.hpp b/include/boost/archive/binary_iarchive_impl.hpp index 258a8101..35aef226 100644 --- a/include/boost/archive/binary_iarchive_impl.hpp +++ b/include/boost/archive/binary_iarchive_impl.hpp @@ -42,9 +42,9 @@ class binary_iarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_iarchive; friend basic_binary_iarchive; friend load_access; diff --git a/include/boost/archive/binary_oarchive_impl.hpp b/include/boost/archive/binary_oarchive_impl.hpp index 2e0fc818..d7e1bc17 100644 --- a/include/boost/archive/binary_oarchive_impl.hpp +++ b/include/boost/archive/binary_oarchive_impl.hpp @@ -43,9 +43,9 @@ class binary_oarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_oarchive; friend basic_binary_oarchive; friend save_access; diff --git a/include/boost/archive/text_iarchive.hpp b/include/boost/archive/text_iarchive.hpp index 507ff36f..d426b7d3 100644 --- a/include/boost/archive/text_iarchive.hpp +++ b/include/boost/archive/text_iarchive.hpp @@ -48,9 +48,9 @@ class text_iarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_iarchive; friend load_access; #else diff --git a/include/boost/archive/text_oarchive.hpp b/include/boost/archive/text_oarchive.hpp index 9496cd27..b35c195e 100644 --- a/include/boost/archive/text_oarchive.hpp +++ b/include/boost/archive/text_oarchive.hpp @@ -55,9 +55,9 @@ class text_oarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_oarchive; friend basic_text_oarchive; friend save_access; diff --git a/include/boost/archive/text_wiarchive.hpp b/include/boost/archive/text_wiarchive.hpp index 42fc56f2..77ee306a 100644 --- a/include/boost/archive/text_wiarchive.hpp +++ b/include/boost/archive/text_wiarchive.hpp @@ -52,9 +52,9 @@ class text_wiarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_iarchive; friend load_access; #else diff --git a/include/boost/archive/text_woarchive.hpp b/include/boost/archive/text_woarchive.hpp index 31cdceb8..a7cad02b 100644 --- a/include/boost/archive/text_woarchive.hpp +++ b/include/boost/archive/text_woarchive.hpp @@ -60,9 +60,9 @@ class text_woarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_oarchive; friend basic_text_oarchive; friend save_access; diff --git a/include/boost/archive/xml_iarchive.hpp b/include/boost/archive/xml_iarchive.hpp index 2234c864..f928bbee 100644 --- a/include/boost/archive/xml_iarchive.hpp +++ b/include/boost/archive/xml_iarchive.hpp @@ -52,9 +52,9 @@ class xml_iarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_iarchive; friend basic_xml_iarchive; friend load_access; diff --git a/include/boost/archive/xml_oarchive.hpp b/include/boost/archive/xml_oarchive.hpp index db9c2e07..8bb70a5e 100644 --- a/include/boost/archive/xml_oarchive.hpp +++ b/include/boost/archive/xml_oarchive.hpp @@ -55,9 +55,9 @@ class xml_oarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_oarchive; friend basic_xml_oarchive; friend save_access; diff --git a/include/boost/archive/xml_wiarchive.hpp b/include/boost/archive/xml_wiarchive.hpp index 8522bb67..e0e088d9 100644 --- a/include/boost/archive/xml_wiarchive.hpp +++ b/include/boost/archive/xml_wiarchive.hpp @@ -57,9 +57,9 @@ class xml_wiarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_iarchive; friend basic_xml_iarchive; friend load_access; diff --git a/include/boost/archive/xml_woarchive.hpp b/include/boost/archive/xml_woarchive.hpp index 5b0a11f4..79500f38 100644 --- a/include/boost/archive/xml_woarchive.hpp +++ b/include/boost/archive/xml_woarchive.hpp @@ -59,9 +59,9 @@ class xml_woarchive_impl : public: #else protected: - #if BOOST_WORKAROUND(BOOST_MSVC, <= 1500) + #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) // for some inexplicable reason insertion of "class" generates compile erro - // on msvc 8.0 + // on msvc 7.1 friend detail::interface_oarchive; friend basic_xml_oarchive; friend save_access; diff --git a/include/boost/serialization/shared_ptr_helper.hpp b/include/boost/serialization/shared_ptr_helper.hpp index e111e7ae..7c94ff2a 100644 --- a/include/boost/serialization/shared_ptr_helper.hpp +++ b/include/boost/serialization/shared_ptr_helper.hpp @@ -43,7 +43,7 @@ class extended_type_info; #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS template class SPT > -inline void load( +void load( Archive & ar, SPT< class U > &t, const unsigned int file_version @@ -93,7 +93,7 @@ class shared_ptr_helper { public: #else template - friend inline void boost::serialization::load( + friend void boost::serialization::load( Archive & ar, SPT< U > &t, const unsigned int file_version