From: kronbichler Date: Sat, 7 Apr 2012 18:55:35 +0000 (+0000) Subject: Apply previously applied patches to boost. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2980fc8473d13a87604b6edcdaef346e191a0ecc;p=dealii-svn.git Apply previously applied patches to boost. git-svn-id: https://svn.dealii.org/trunk@25394 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/boost-1.49.0/include/boost/archive/impl/archive_serializer_map.ipp b/deal.II/contrib/boost-1.49.0/include/boost/archive/impl/archive_serializer_map.ipp index c8ad96b3d7..dee00579ce 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/archive/impl/archive_serializer_map.ipp +++ b/deal.II/contrib/boost-1.49.0/include/boost/archive/impl/archive_serializer_map.ipp @@ -12,6 +12,9 @@ // implementation of basic_text_iprimitive overrides for the combination // of template parameters used to implement a text_iprimitive +#ifndef BOOST_HEADER_GUARD_ARCHIVE_SERIALIZER_MAP_IPP +#define BOOST_HEADER_GUARD_ARCHIVE_SERIALIZER_MAP_IPP + #include #include #include @@ -69,3 +72,5 @@ archive_serializer_map::find( } // namespace detail } // namespace archive } // namespace boost + +#endif // BOOST_HEADER_GUARD_ARCHIVE_SERIALIZER_MAP_IPP diff --git a/deal.II/contrib/boost-1.49.0/include/boost/archive/iterators/remove_whitespace.hpp b/deal.II/contrib/boost-1.49.0/include/boost/archive/iterators/remove_whitespace.hpp index a8e1092983..afe161e988 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/archive/iterators/remove_whitespace.hpp +++ b/deal.II/contrib/boost-1.49.0/include/boost/archive/iterators/remove_whitespace.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // remove_whitespace.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002, 2010 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) @@ -54,8 +54,6 @@ namespace std{ using ::isspace; } //#endif // BOOST_WORKAROUND -namespace { // anonymous - template struct remove_whitespace_predicate; @@ -77,7 +75,6 @@ struct remove_whitespace_predicate }; #endif -} // namespace anonymous /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // convert base64 file data (including whitespace and padding) to binary diff --git a/deal.II/contrib/boost-1.49.0/include/boost/archive/text_oarchive.hpp b/deal.II/contrib/boost-1.49.0/include/boost/archive/text_oarchive.hpp index 2100d539ef..0109366939 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/archive/text_oarchive.hpp +++ b/deal.II/contrib/boost-1.49.0/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: diff --git a/deal.II/contrib/boost-1.49.0/include/boost/archive/xml_oarchive.hpp b/deal.II/contrib/boost-1.49.0/include/boost/archive/xml_oarchive.hpp index 167ba09370..a4ede37a87 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/archive/xml_oarchive.hpp +++ b/deal.II/contrib/boost-1.49.0/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: diff --git a/deal.II/contrib/boost-1.49.0/include/boost/property_tree/detail/json_parser_write.hpp b/deal.II/contrib/boost-1.49.0/include/boost/property_tree/detail/json_parser_write.hpp index 7639887f65..a9fafc373c 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/property_tree/detail/json_parser_write.hpp +++ b/deal.II/contrib/boost-1.49.0/include/boost/property_tree/detail/json_parser_write.hpp @@ -19,6 +19,21 @@ namespace boost { namespace property_tree { namespace json_parser { + namespace + { + bool is_ascii (const char) + { + return true; + } + + template + bool is_ascii (const Ch c) + { + return c <= 0xFF; + } + } + + // Create necessary escape sequences from illegal characters template @@ -33,7 +48,7 @@ namespace boost { namespace property_tree { namespace json_parser // We escape everything outside ASCII, because this code can't // handle high unicode characters. if (*b == 0x20 || *b == 0x21 || (*b >= 0x23 && *b <= 0x2E) || - (*b >= 0x30 && *b <= 0x5B) || (*b >= 0x5D && *b <= 0xFF)) + (*b >= 0x30 && *b <= 0x5B) || (*b >= 0x5D && is_ascii(*b))) result += *b; else if (*b == Ch('\b')) result += Ch('\\'), result += Ch('b'); else if (*b == Ch('\f')) result += Ch('\\'), result += Ch('f'); diff --git a/deal.II/contrib/boost-1.49.0/include/boost/signals2/detail/variadic_slot_invoker.hpp b/deal.II/contrib/boost-1.49.0/include/boost/signals2/detail/variadic_slot_invoker.hpp index 08059b5d0a..e6ed07a922 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/signals2/detail/variadic_slot_invoker.hpp +++ b/deal.II/contrib/boost-1.49.0/include/boost/signals2/detail/variadic_slot_invoker.hpp @@ -80,6 +80,7 @@ namespace boost template R m_invoke(void *, Func &func, unsigned_meta_array, std::tuple args) const { + (void)args; func(std::get(args)...); return R(); } diff --git a/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/actions.hpp b/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/actions.hpp index d35d5e3330..f712e0513b 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/actions.hpp +++ b/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/actions.hpp @@ -15,7 +15,7 @@ #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) # pragma message ("Warning: This header is deprecated. Please use: boost/spirit/include/classic_actions.hpp") #elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__) -# warning "This header is deprecated. Please use: boost/spirit/include/classic_actions.hpp" +//# warning "This header is deprecated. Please use: boost/spirit/include/classic_actions.hpp" #endif #endif diff --git a/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/operators.hpp b/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/operators.hpp index 5474f2a55a..50519672a6 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/operators.hpp +++ b/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/operators.hpp @@ -15,7 +15,7 @@ #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) # pragma message ("Warning: This header is deprecated. Please use: boost/spirit/include/classic_operators.hpp") #elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__) -# warning "This header is deprecated. Please use: boost/spirit/include/classic_operators.hpp" +//# warning "This header is deprecated. Please use: boost/spirit/include/classic_operators.hpp" #endif #endif diff --git a/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/non_terminal/rule.hpp b/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/non_terminal/rule.hpp index 47ae7c9302..5e34b0251d 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/non_terminal/rule.hpp +++ b/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/non_terminal/rule.hpp @@ -15,7 +15,7 @@ #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) # pragma message ("Warning: This header is deprecated. Please use: boost/spirit/include/classic_rule.hpp") #elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__) -# warning "This header is deprecated. Please use: boost/spirit/include/classic_rule.hpp" +//# warning "This header is deprecated. Please use: boost/spirit/include/classic_rule.hpp" #endif #endif diff --git a/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/primitives/numerics.hpp b/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/primitives/numerics.hpp index e03218f67e..7a55268566 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/primitives/numerics.hpp +++ b/deal.II/contrib/boost-1.49.0/include/boost/spirit/core/primitives/numerics.hpp @@ -15,7 +15,7 @@ #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) # pragma message ("Warning: This header is deprecated. Please use: boost/spirit/include/classic_numerics.hpp") #elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__) -# warning "This header is deprecated. Please use: boost/spirit/include/classic_numerics.hpp" +//# warning "This header is deprecated. Please use: boost/spirit/include/classic_numerics.hpp" #endif #endif diff --git a/deal.II/contrib/boost-1.49.0/libs/serialization/src/basic_serializer_map.cpp b/deal.II/contrib/boost-1.49.0/libs/serialization/src/basic_serializer_map.cpp index 80e805fabd..886dda6b8e 100644 --- a/deal.II/contrib/boost-1.49.0/libs/serialization/src/basic_serializer_map.cpp +++ b/deal.II/contrib/boost-1.49.0/libs/serialization/src/basic_serializer_map.cpp @@ -45,6 +45,7 @@ basic_serializer_map::insert(const basic_serializer * bs){ // attempt to insert serializer into it's map const std::pair result = m_map.insert(bs); + (void)result; // the following is commented out - rather than being just // deleted as a reminder not to try this. diff --git a/deal.II/contrib/boost-1.49.0/libs/thread/src/pthread/once.cpp b/deal.II/contrib/boost-1.49.0/libs/thread/src/pthread/once.cpp index 6e0466f17e..a45cc4b0f9 100644 --- a/deal.II/contrib/boost-1.49.0/libs/thread/src/pthread/once.cpp +++ b/deal.II/contrib/boost-1.49.0/libs/thread/src/pthread/once.cpp @@ -3,7 +3,10 @@ // Distributed under 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) +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif + #include #include #include