|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r86052 - in trunk/boost/archive: . detail impl iterators
From: steveire_at_[hidden]
Date: 2013-09-30 07:22:56
Author: skelly
Date: 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013)
New Revision: 86052
URL: http://svn.boost.org/trac/boost/changeset/86052
Log:
Archive: Remove obsolete MSVC version checks.
Text files modified:
trunk/boost/archive/basic_binary_iarchive.hpp | 8 --------
trunk/boost/archive/basic_binary_oarchive.hpp | 8 --------
trunk/boost/archive/basic_text_iarchive.hpp | 8 --------
trunk/boost/archive/basic_text_oarchive.hpp | 7 +------
trunk/boost/archive/basic_xml_iarchive.hpp | 8 --------
trunk/boost/archive/basic_xml_oarchive.hpp | 9 ---------
trunk/boost/archive/detail/iserializer.hpp | 1 -
trunk/boost/archive/impl/basic_binary_iarchive.ipp | 5 +----
trunk/boost/archive/impl/basic_text_iarchive.ipp | 5 +----
trunk/boost/archive/impl/basic_xml_grammar.hpp | 5 -----
trunk/boost/archive/iterators/remove_whitespace.hpp | 5 -----
11 files changed, 3 insertions(+), 66 deletions(-)
Modified: trunk/boost/archive/basic_binary_iarchive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_iarchive.hpp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/basic_binary_iarchive.hpp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -51,15 +51,7 @@
public detail::common_iarchive<Archive>
{
protected:
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-public:
-#elif defined(BOOST_MSVC)
- // for some inexplicable reason insertion of "class" generates compile erro
- // on msvc 7.1
- friend detail::interface_iarchive<Archive>;
-#else
friend class detail::interface_iarchive<Archive>;
-#endif
// intermediate level to support override of operators
// fot templates in the absence of partial function
// template ordering. If we get here pass to base class
Modified: trunk/boost/archive/basic_binary_oarchive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_oarchive.hpp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/basic_binary_oarchive.hpp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -59,15 +59,7 @@
public archive::detail::common_oarchive<Archive>
{
protected:
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-public:
-#elif defined(BOOST_MSVC)
- // for some inexplicable reason insertion of "class" generates compile erro
- // on msvc 7.1
- friend detail::interface_oarchive<Archive>;
-#else
friend class detail::interface_oarchive<Archive>;
-#endif
// any datatype not specifed below will be handled by base class
typedef detail::common_oarchive<Archive> detail_common_oarchive;
template<class T>
Modified: trunk/boost/archive/basic_text_iarchive.hpp
==============================================================================
--- trunk/boost/archive/basic_text_iarchive.hpp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/basic_text_iarchive.hpp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -47,15 +47,7 @@
public detail::common_iarchive<Archive>
{
protected:
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-public:
-#elif defined(BOOST_MSVC)
- // for some inexplicable reason insertion of "class" generates compile erro
- // on msvc 7.1
- friend detail::interface_iarchive<Archive>;
-#else
friend class detail::interface_iarchive<Archive>;
-#endif
// intermediate level to support override of operators
// fot templates in the absence of partial function
// template ordering
Modified: trunk/boost/archive/basic_text_oarchive.hpp
==============================================================================
--- trunk/boost/archive/basic_text_oarchive.hpp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/basic_text_oarchive.hpp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -49,13 +49,8 @@
public detail::common_oarchive<Archive>
{
protected:
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
-|| BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x560))
+#if BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x560))
public:
-#elif defined(BOOST_MSVC)
- // for some inexplicable reason insertion of "class" generates compile erro
- // on msvc 7.1
- friend detail::interface_oarchive<Archive>;
#else
friend class detail::interface_oarchive<Archive>;
#endif
Modified: trunk/boost/archive/basic_xml_iarchive.hpp
==============================================================================
--- trunk/boost/archive/basic_xml_iarchive.hpp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/basic_xml_iarchive.hpp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -44,15 +44,7 @@
public detail::common_iarchive<Archive>
{
protected:
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-public:
-#elif defined(BOOST_MSVC)
- // for some inexplicable reason insertion of "class" generates compile erro
- // on msvc 7.1
- friend detail::interface_oarchive<Archive>;
-#else
friend class detail::interface_oarchive<Archive>;
-#endif
unsigned int depth;
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
load_start(const char *name);
Modified: trunk/boost/archive/basic_xml_oarchive.hpp
==============================================================================
--- trunk/boost/archive/basic_xml_oarchive.hpp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/basic_xml_oarchive.hpp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -43,17 +43,8 @@
public detail::common_oarchive<Archive>
{
protected:
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-public:
-#elif defined(BOOST_MSVC)
- // for some inexplicable reason insertion of "class" generates compile erro
- // on msvc 7.1
- friend detail::interface_oarchive<Archive>;
- friend class save_access;
-#else
friend class detail::interface_oarchive<Archive>;
friend class save_access;
-#endif
// special stuff for xml output
unsigned int depth;
bool indent_next;
Modified: trunk/boost/archive/detail/iserializer.hpp
==============================================================================
--- trunk/boost/archive/detail/iserializer.hpp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/detail/iserializer.hpp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -62,7 +62,6 @@
#define DONT_USE_HAS_NEW_OPERATOR ( \
defined(__BORLANDC__) \
|| BOOST_WORKAROUND(__IBMCPP__, < 1210) \
- || defined(BOOST_MSVC) && (BOOST_MSVC <= 1300) \
|| defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x590) \
)
Modified: trunk/boost/archive/impl/basic_binary_iarchive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_binary_iarchive.ipp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/impl/basic_binary_iarchive.ipp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -113,10 +113,7 @@
#if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205))
this->set_library_version(input_library_version);
#else
- #if ! BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
- detail::
- #endif
- basic_iarchive::set_library_version(input_library_version);
+ detail::basic_iarchive::set_library_version(input_library_version);
#endif
if(BOOST_ARCHIVE_VERSION() < input_library_version)
Modified: trunk/boost/archive/impl/basic_text_iarchive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_text_iarchive.ipp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/impl/basic_text_iarchive.ipp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -62,10 +62,7 @@
#if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205))
this->set_library_version(input_library_version);
#else
- #if ! BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
- detail::
- #endif
- basic_iarchive::set_library_version(input_library_version);
+ detail::basic_iarchive::set_library_version(input_library_version);
#endif
// extra little .t is to get around borland quirk
Modified: trunk/boost/archive/impl/basic_xml_grammar.hpp
==============================================================================
--- trunk/boost/archive/impl/basic_xml_grammar.hpp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/impl/basic_xml_grammar.hpp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -50,11 +50,6 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
-// supress noise
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
-# pragma warning (disable : 4786) // too long name, harmless warning
-#endif
-
#include <boost/spirit/include/classic_rule.hpp>
#include <boost/spirit/include/classic_chset.hpp>
Modified: trunk/boost/archive/iterators/remove_whitespace.hpp
==============================================================================
--- trunk/boost/archive/iterators/remove_whitespace.hpp Mon Sep 30 07:22:29 2013 (r86051)
+++ trunk/boost/archive/iterators/remove_whitespace.hpp 2013-09-30 07:22:56 EDT (Mon, 30 Sep 2013) (r86052)
@@ -26,9 +26,6 @@
#include <boost/iterator/filter_iterator.hpp>
#include <boost/iterator/iterator_traits.hpp>
-//#include <boost/detail/workaround.hpp>
-//#if ! BOOST_WORKAROUND(BOOST_MSVC, <=1300)
-
// here is the default standard implementation of the functor used
// by the filter iterator to remove spaces. Unfortunately usage
// of this implementation in combination with spirit trips a bug
@@ -53,8 +50,6 @@
#undef iswspace
#endif
-//#endif // BOOST_WORKAROUND
-
namespace { // anonymous
template<class CharType>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk