From: bangerth Date: Fri, 7 Oct 2011 13:04:46 +0000 (+0000) Subject: Avoid warnings with ICC. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80fab65c511338cf1c0d81bd8c6d0748ec595afe;p=dealii-svn.git Avoid warnings with ICC. git-svn-id: https://svn.dealii.org/trunk@24554 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/boost-1.46.1/include/boost/archive/xml_oarchive.hpp b/deal.II/contrib/boost-1.46.1/include/boost/archive/xml_oarchive.hpp index 167ba09370..a4ede37a87 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/archive/xml_oarchive.hpp +++ b/deal.II/contrib/boost-1.46.1/include/boost/archive/xml_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_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 // size_t #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -43,7 +43,7 @@ namespace boost { namespace archive { template -class xml_oarchive_impl : +class xml_oarchive_impl : public basic_text_oprimitive, public basic_xml_oarchive { @@ -62,15 +62,15 @@ protected: void save(const T & t){ basic_text_oprimitive::save(t); } - void + void save(const version_type & t){ - save(static_cast(t)); + save(static_cast(t)); } - void + 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) @@ -82,7 +82,7 @@ protected: BOOST_ARCHIVE_DECL(void) save(const std::wstring &ws); #endif - BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) + BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) xml_oarchive_impl(std::ostream & os, unsigned int flags); ~xml_oarchive_impl(){} public: @@ -93,7 +93,7 @@ public: #else this->basic_text_oprimitive::save_binary( #endif - address, + address, count ); this->indent_next = true; @@ -106,7 +106,7 @@ public: // do not derive from this class. If you want to extend this functionality // via inhertance, derived from xml_oarchive_impl instead. This will // preserve correct static polymorphism. -class xml_oarchive : +class xml_oarchive : public xml_oarchive_impl { public: