]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Apply patches we already had in the previous version of boost.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 17 May 2011 01:23:44 +0000 (01:23 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 17 May 2011 01:23:44 +0000 (01:23 +0000)
git-svn-id: https://svn.dealii.org/trunk@23703 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/contrib/boost-1.46.1/include/boost/archive/impl/archive_serializer_map.ipp
deal.II/contrib/boost-1.46.1/include/boost/archive/iterators/remove_whitespace.hpp
deal.II/contrib/boost-1.46.1/include/boost/property_tree/detail/json_parser_write.hpp
deal.II/contrib/boost-1.46.1/include/boost/property_tree/detail/rapidxml.hpp
deal.II/contrib/boost-1.46.1/include/boost/spirit/core/composite/actions.hpp
deal.II/contrib/boost-1.46.1/include/boost/spirit/core/composite/operators.hpp
deal.II/contrib/boost-1.46.1/include/boost/spirit/core/non_terminal/rule.hpp
deal.II/contrib/boost-1.46.1/include/boost/spirit/core/primitives/numerics.hpp

index c8ad96b3d7ca120900abcf2021a69898e97130b3..dee00579cef3e30d713f24660039d430af2031b4 100644 (file)
@@ -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 <boost/config.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 #include <boost/archive/detail/basic_serializer_map.hpp>
@@ -69,3 +72,5 @@ archive_serializer_map<Archive>::find(
 } // namespace detail
 } // namespace archive
 } // namespace boost
+
+#endif // BOOST_HEADER_GUARD_ARCHIVE_SERIALIZER_MAP_IPP
index a8e109298373ce91ad3eb01cecca62bbed8eec5c..afe161e9881bfd6b66429576a810801290dc78a3 100644 (file)
@@ -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<class CharType>
 struct remove_whitespace_predicate;
 
@@ -77,7 +75,6 @@ struct remove_whitespace_predicate<wchar_t>
 };
 #endif
 
-} // namespace anonymous
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // convert base64 file data (including whitespace and padding) to binary
index 7639887f65bc1be4f50f9f87ad9f46f0aefef041..a9fafc373c771dff0daaf6986a562818380bc062 100644 (file)
 
 namespace boost { namespace property_tree { namespace json_parser
 {
+  namespace
+  {
+    bool is_ascii (const char)
+    {
+      return true;
+    }
+
+    template <typename Ch>
+    bool is_ascii (const Ch c)
+    {
+      return c <= 0xFF;
+    }
+  }
+
+
 
     // Create necessary escape sequences from illegal characters
     template<class Ch>
@@ -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');
index 712bf3fb75c2d8d73258100ef05fd2b1063cfe29..b8c005bee9cfcf07ddc8192d00fa796e4df1b567 100644 (file)
@@ -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 <typename Ch>
+       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';
             }
index d35d5e33309a2e105361449c71064c8bae0afd10..f712e0513b853fc89aacb2df7593795488ff2e5c 100644 (file)
@@ -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
 
index 5474f2a55a68c34300d83f3cf5a412ee7a7ca5b5..50519672a6a52b165c1f12e185d0bcea6f75930a 100644 (file)
@@ -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
 
index 47ae7c930278884b852a27d12f4cdc66a4589e68..5e34b0251d1cdbbab1ab7b35f96006678a8419f2 100644 (file)
@@ -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
 
index e03218f67e688de0675dae156f8bda3d5e381000..7a55268566757cb99b8c03a223acedef05cb0743 100644 (file)
@@ -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
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.