From 5227d6f3a62abef45ee97c334ea031b049842a67 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 17 May 2011 01:23:44 +0000 Subject: [PATCH] Apply patches we already had in the previous version of boost. git-svn-id: https://svn.dealii.org/trunk@23703 0785d39b-7218-0410-832d-ea1e28bc413d --- .../archive/impl/archive_serializer_map.ipp | 5 +++++ .../archive/iterators/remove_whitespace.hpp | 5 +---- .../detail/json_parser_write.hpp | 17 ++++++++++++++++- .../boost/property_tree/detail/rapidxml.hpp | 19 ++++++++++++++++++- .../boost/spirit/core/composite/actions.hpp | 2 +- .../boost/spirit/core/composite/operators.hpp | 2 +- .../boost/spirit/core/non_terminal/rule.hpp | 2 +- .../boost/spirit/core/primitives/numerics.hpp | 2 +- 8 files changed, 44 insertions(+), 10 deletions(-) diff --git a/deal.II/contrib/boost-1.46.1/include/boost/archive/impl/archive_serializer_map.ipp b/deal.II/contrib/boost-1.46.1/include/boost/archive/impl/archive_serializer_map.ipp index c8ad96b3d7..dee00579ce 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/archive/impl/archive_serializer_map.ipp +++ b/deal.II/contrib/boost-1.46.1/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.46.1/include/boost/archive/iterators/remove_whitespace.hpp b/deal.II/contrib/boost-1.46.1/include/boost/archive/iterators/remove_whitespace.hpp index a8e1092983..afe161e988 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/archive/iterators/remove_whitespace.hpp +++ b/deal.II/contrib/boost-1.46.1/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.46.1/include/boost/property_tree/detail/json_parser_write.hpp b/deal.II/contrib/boost-1.46.1/include/boost/property_tree/detail/json_parser_write.hpp index 7639887f65..a9fafc373c 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/property_tree/detail/json_parser_write.hpp +++ b/deal.II/contrib/boost-1.46.1/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.46.1/include/boost/property_tree/detail/rapidxml.hpp b/deal.II/contrib/boost-1.46.1/include/boost/property_tree/detail/rapidxml.hpp index 712bf3fb75..b8c005bee9 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/property_tree/detail/rapidxml.hpp +++ b/deal.II/contrib/boost-1.46.1/include/boost/property_tree/detail/rapidxml.hpp @@ -259,6 +259,23 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml //! \cond internal namespace internal { + namespace + { + inline + bool beyond_ascii (const char) + { + return false; + } + + template + inline + bool beyond_ascii (const Ch c) + { + return (c > 255); + } + } + + // Struct that contains lookup tables for the parser // It must be a template to allow correct linking (because it has static data members, which are defined in a header file). @@ -314,7 +331,7 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml inline size_t get_index(const Ch c) { // If not ASCII char, its sematic is same as plain 'z' - if (c > 255) + if (beyond_ascii(c)) { return 'z'; } diff --git a/deal.II/contrib/boost-1.46.1/include/boost/spirit/core/composite/actions.hpp b/deal.II/contrib/boost-1.46.1/include/boost/spirit/core/composite/actions.hpp index d35d5e3330..f712e0513b 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/spirit/core/composite/actions.hpp +++ b/deal.II/contrib/boost-1.46.1/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.46.1/include/boost/spirit/core/composite/operators.hpp b/deal.II/contrib/boost-1.46.1/include/boost/spirit/core/composite/operators.hpp index 5474f2a55a..50519672a6 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/spirit/core/composite/operators.hpp +++ b/deal.II/contrib/boost-1.46.1/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.46.1/include/boost/spirit/core/non_terminal/rule.hpp b/deal.II/contrib/boost-1.46.1/include/boost/spirit/core/non_terminal/rule.hpp index 47ae7c9302..5e34b0251d 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/spirit/core/non_terminal/rule.hpp +++ b/deal.II/contrib/boost-1.46.1/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.46.1/include/boost/spirit/core/primitives/numerics.hpp b/deal.II/contrib/boost-1.46.1/include/boost/spirit/core/primitives/numerics.hpp index e03218f67e..7a55268566 100644 --- a/deal.II/contrib/boost-1.46.1/include/boost/spirit/core/primitives/numerics.hpp +++ b/deal.II/contrib/boost-1.46.1/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 -- 2.39.5