address MSVC shared_ptr helper problem

attempt yet again to address MSVC 8.0 issues
2026-02-11 12:02:31 +00:00 · 2014-03-19 18:00:55 -07:00
parent 1d07e1dd57
commit 4fff20dff4
17 changed files with 21 additions and 21 deletions
--- a/include/boost/archive/basic_binary_iarchive.hpp
+++ b/include/boost/archive/basic_binary_iarchive.hpp
@@ -58,7 +58,7 @@ class basic_binary_iarchive :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_iarchive<Archive>;
--- a/include/boost/archive/basic_binary_oarchive.hpp
+++ b/include/boost/archive/basic_binary_oarchive.hpp
@@ -66,7 +66,7 @@ class basic_binary_oarchive :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_oarchive<Archive>;
--- a/include/boost/archive/basic_text_iarchive.hpp
+++ b/include/boost/archive/basic_text_iarchive.hpp
@@ -54,7 +54,7 @@ class basic_text_iarchive :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_iarchive<Archive>;
--- a/include/boost/archive/basic_text_oarchive.hpp
+++ b/include/boost/archive/basic_text_oarchive.hpp
@@ -56,7 +56,7 @@ class basic_text_oarchive :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_oarchive<Archive>;
--- a/include/boost/archive/basic_xml_iarchive.hpp
+++ b/include/boost/archive/basic_xml_iarchive.hpp
@@ -51,7 +51,7 @@ class basic_xml_iarchive :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_iarchive<Archive>;
--- a/include/boost/archive/basic_xml_oarchive.hpp
+++ b/include/boost/archive/basic_xml_oarchive.hpp
@@ -51,7 +51,7 @@ public:
 #else
 protected:
 #endif
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
    // for some inexplicable reason insertion of "class" generates compile erro
    // on msvc 7.1
    friend detail::interface_oarchive<Archive>;
--- a/include/boost/archive/binary_iarchive_impl.hpp
+++ b/include/boost/archive/binary_iarchive_impl.hpp
@@ -42,7 +42,7 @@ class binary_iarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_iarchive<Archive>;
--- a/include/boost/archive/binary_oarchive_impl.hpp
+++ b/include/boost/archive/binary_oarchive_impl.hpp
@@ -43,7 +43,7 @@ class binary_oarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_oarchive<Archive>;
--- a/include/boost/archive/text_iarchive.hpp
+++ b/include/boost/archive/text_iarchive.hpp
@@ -48,7 +48,7 @@ class text_iarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_iarchive<Archive>;
--- a/include/boost/archive/text_oarchive.hpp
+++ b/include/boost/archive/text_oarchive.hpp
@@ -55,7 +55,7 @@ class text_oarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_oarchive<Archive>;
--- a/include/boost/archive/text_wiarchive.hpp
+++ b/include/boost/archive/text_wiarchive.hpp
@@ -52,7 +52,7 @@ class text_wiarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_iarchive<Archive>;
--- a/include/boost/archive/text_woarchive.hpp
+++ b/include/boost/archive/text_woarchive.hpp
@@ -60,7 +60,7 @@ class text_woarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_oarchive<Archive>;
--- a/include/boost/archive/xml_iarchive.hpp
+++ b/include/boost/archive/xml_iarchive.hpp
@@ -52,7 +52,7 @@ class xml_iarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_iarchive<Archive>;
--- a/include/boost/archive/xml_oarchive.hpp
+++ b/include/boost/archive/xml_oarchive.hpp
@@ -55,7 +55,7 @@ class xml_oarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_oarchive<Archive>;
--- a/include/boost/archive/xml_wiarchive.hpp
+++ b/include/boost/archive/xml_wiarchive.hpp
@@ -57,7 +57,7 @@ class xml_wiarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_iarchive<Archive>;
--- a/include/boost/archive/xml_woarchive.hpp
+++ b/include/boost/archive/xml_woarchive.hpp
@@ -59,7 +59,7 @@ class xml_woarchive_impl :
 public:
 #else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
        // for some inexplicable reason insertion of "class" generates compile erro
        // on msvc 7.1
        friend detail::interface_oarchive<Archive>;
--- a/include/boost/serialization/shared_ptr_helper.hpp
+++ b/include/boost/serialization/shared_ptr_helper.hpp
@@ -89,7 +89,7 @@ class shared_ptr_helper {
    }
    #endif

-#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
+#if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) || defined(BOOST_MSVC)
 public:
 #else
    template<class Archive, class U>
@@ -99,8 +99,8 @@ public:
        const unsigned int file_version
    );
 #endif
-    template<class U>
    struct non_polymorphic {
+        template<class U>
        static const boost::serialization::extended_type_info * 
        get_object_type(U & ){
            return & boost::serialization::singleton<
@@ -109,8 +109,8 @@ public:
            >::get_const_instance();
        }
    };
-    template<class U>
    struct polymorphic {
+        template<class U>
        static const boost::serialization::extended_type_info * 
        get_object_type(U & u){
            return boost::serialization::singleton<
@@ -135,8 +135,8 @@ public:
        // the object type identifer
        typedef BOOST_DEDUCED_TYPENAME mpl::if_<
            is_polymorphic< T >,
-            polymorphic<T>,
-            non_polymorphic<T>
+            polymorphic,
+            non_polymorphic
        >::type type;

        const boost::serialization::extended_type_info * true_type