mirror of
https://github.com/boostorg/serialization.git
synced 2026-02-11 12:02:31 +00:00
attempt to make tests pass on mdvc 8.0
This commit is contained in:
@@ -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<Archive>;
|
||||
#else
|
||||
friend class detail::interface_iarchive<Archive>;
|
||||
|
||||
@@ -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<Archive>;
|
||||
#else
|
||||
friend class detail::interface_oarchive<Archive>;
|
||||
|
||||
@@ -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<Archive>;
|
||||
#else
|
||||
friend class detail::interface_iarchive<Archive>;
|
||||
|
||||
@@ -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<Archive>;
|
||||
#else
|
||||
friend class detail::interface_oarchive<Archive>;
|
||||
|
||||
@@ -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<Archive>;
|
||||
#else
|
||||
friend class detail::interface_iarchive<Archive>;
|
||||
|
||||
@@ -46,14 +46,14 @@ template<class Archive>
|
||||
class basic_xml_oarchive :
|
||||
public detail::common_oarchive<Archive>
|
||||
{
|
||||
#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<Archive>;
|
||||
#else
|
||||
friend class detail::interface_oarchive<Archive>;
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend basic_binary_iarchive<Archive>;
|
||||
friend load_access;
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend basic_binary_oarchive<Archive>;
|
||||
friend save_access;
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend load_access;
|
||||
#else
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend basic_text_oarchive<Archive>;
|
||||
friend save_access;
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend load_access;
|
||||
#else
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend basic_text_oarchive<Archive>;
|
||||
friend save_access;
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend basic_xml_iarchive<Archive>;
|
||||
friend load_access;
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend basic_xml_oarchive<Archive>;
|
||||
friend save_access;
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend basic_xml_iarchive<Archive>;
|
||||
friend load_access;
|
||||
|
||||
@@ -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<Archive>;
|
||||
friend basic_xml_oarchive<Archive>;
|
||||
friend save_access;
|
||||
|
||||
@@ -43,7 +43,7 @@ class extended_type_info;
|
||||
|
||||
#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
|
||||
template<class Archive, template<class U> 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<class Archive, class U>
|
||||
friend inline void boost::serialization::load(
|
||||
friend void boost::serialization::load(
|
||||
Archive & ar,
|
||||
SPT< U > &t,
|
||||
const unsigned int file_version
|
||||
|
||||
Reference in New Issue
Block a user