correct access

[SVN r25630]

include/boost/archive/binary_iarchive.hpp

@@ -36,6 +36,10 @@ public:
     friend class basic_binary_iarchive<Archive>;
     friend class load_access;
 #endif
+    // return a pointer to the most derived class
+    Archive * This(){
+        return static_cast<Archive *>(this);
+    }
     // note: the following should not needed - but one compiler (vc 7.1)
     // fails to compile one test (test_shared_ptr) without it !!!
     template<class T>

include/boost/archive/binary_wiarchive.hpp

@@ -31,10 +31,14 @@ class binary_wiarchive_impl :
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
+    friend class detail::interface_iarchive<Archive>;
     friend class basic_binary_iarchive<Archive>;
-    friend class basic_binary_iprimitive<Archive, std::wistream>;
     friend class load_access;
 #endif
+    // return a pointer to the most derived class
+    Archive * This(){
+        return static_cast<Archive *>(this);
+    }
     // note: the following should not needed - but one compiler (vc 7.1)
     // fails to compile one test (test_shared_ptr) without it !!!
     template<class T>

include/boost/archive/binary_woarchive.hpp

@@ -31,8 +31,8 @@ class binary_woarchive_impl :
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
+    friend class detail::interface_oarchive<Archive>;
     friend class basic_binary_oarchive<Archive>;
-    friend class basic_binary_oprimitive<Archive, std::wostream>;
     friend class save_access;
 protected:
 #endif

include/boost/archive/text_iarchive.hpp

@@ -50,6 +50,10 @@ public:
     #ifndef BOOST_NO_STD_WSTRING
     void load(std::wstring &ws);
     #endif
+    // return a pointer to the most derived class
+    Archive * This(){
+        return static_cast<Archive *>(this);
+    }
     // note: the following should not needed - but one compiler (vc 7.1)
     // fails to compile one test (test_shared_ptr) without it !!!
     template<class T>

include/boost/archive/text_oarchive.hpp

@@ -41,7 +41,7 @@ protected:
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
-//    friend class detail::interface_oarchive<Archive>;
+    friend class detail::interface_oarchive<Archive>;
     friend class basic_text_oarchive<Archive>;
     friend class save_access;
 #endif

include/boost/archive/text_woarchive.hpp

@@ -41,6 +41,7 @@ protected:
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
+    friend class detail::interface_oarchive<Archive>;
     friend class basic_text_oarchive<Archive>;
     friend class save_access;
 #endif

include/boost/archive/xml_iarchive.hpp

@@ -65,6 +65,10 @@ public:
     #ifndef BOOST_NO_STD_WSTRING
     void load(std::wstring &ws);
     #endif
+    // return a pointer to the most derived class
+    Archive * This(){
+        return static_cast<Archive *>(this);
+    }
     template<class T>
     void load_override(T & t, BOOST_PFTO int){
         basic_xml_iarchive<Archive>::load_override(t, 0);

include/boost/archive/xml_wiarchive.hpp

@@ -65,7 +65,10 @@ public:
     #ifndef BOOST_NO_STD_WSTRING
     void load(std::wstring &ws);
     #endif
-
+    // return a pointer to the most derived class
+    Archive * This(){
+        return static_cast<Archive *>(this);
+    }
     template<class T>
     void load_override(T & t, BOOST_PFTO int){
         basic_xml_iarchive<Archive>::load_override(t, 0);