From c4cf6509e7d5874a083ddc12c7a98f1b83bc2104 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 7 Oct 2011 13:04:16 +0000 Subject: [PATCH] Avoid warnings with ICC. git-svn-id: https://svn.dealii.org/trunk@24553 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/boost/archive/text_oarchive.hpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/deal.II/contrib/boost-1.46.1/include/boost/archive/text_oarchive.hpp b/deal.II/contrib/boost-1.46.1/include/boost/archive/text_oarchive.hpp index 2100d539ef..0109366939 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/archive/text_oarchive.hpp +++ b/deal.II/contrib/boost-1.46.1/include/boost/archive/text_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // text_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -21,8 +21,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -39,11 +39,11 @@ namespace std{ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { template -class text_oarchive_impl : +class text_oarchive_impl : /* protected ? */ public basic_text_oprimitive, public basic_text_oarchive { @@ -61,37 +61,37 @@ protected: basic_text_oprimitive::save(t); } void save(const version_type & t){ - save(static_cast(t)); + save(static_cast(t)); } void save(const boost::serialization::item_version_type & t){ - save(static_cast(t)); + save(static_cast(t)); } - BOOST_ARCHIVE_DECL(void) + BOOST_ARCHIVE_DECL(void) save(const char * t); #ifndef BOOST_NO_INTRINSIC_WCHAR_T - BOOST_ARCHIVE_DECL(void) + BOOST_ARCHIVE_DECL(void) save(const wchar_t * t); #endif - BOOST_ARCHIVE_DECL(void) + BOOST_ARCHIVE_DECL(void) save(const std::string &s); #ifndef BOOST_NO_STD_WSTRING - BOOST_ARCHIVE_DECL(void) + BOOST_ARCHIVE_DECL(void) save(const std::wstring &ws); #endif - BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) + BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) text_oarchive_impl(std::ostream & os, unsigned int flags); // don't import inline definitions! leave this as a reminder. - //BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) + //BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) ~text_oarchive_impl(){}; public: - BOOST_ARCHIVE_DECL(void) + BOOST_ARCHIVE_DECL(void) save_binary(const void *address, std::size_t count); }; // do not derive from this class. If you want to extend this functionality // via inhertance, derived from text_oarchive_impl instead. This will // preserve correct static polymorphism. -class text_oarchive : +class text_oarchive : public text_oarchive_impl { public: -- 2.39.5