]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Apply previously applied patches to boost.
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 7 Apr 2012 18:55:35 +0000 (18:55 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 7 Apr 2012 18:55:35 +0000 (18:55 +0000)
git-svn-id: https://svn.dealii.org/trunk@25394 0785d39b-7218-0410-832d-ea1e28bc413d

12 files changed:
deal.II/contrib/boost-1.49.0/include/boost/archive/impl/archive_serializer_map.ipp
deal.II/contrib/boost-1.49.0/include/boost/archive/iterators/remove_whitespace.hpp
deal.II/contrib/boost-1.49.0/include/boost/archive/text_oarchive.hpp
deal.II/contrib/boost-1.49.0/include/boost/archive/xml_oarchive.hpp
deal.II/contrib/boost-1.49.0/include/boost/property_tree/detail/json_parser_write.hpp
deal.II/contrib/boost-1.49.0/include/boost/signals2/detail/variadic_slot_invoker.hpp
deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/actions.hpp
deal.II/contrib/boost-1.49.0/include/boost/spirit/core/composite/operators.hpp
deal.II/contrib/boost-1.49.0/include/boost/spirit/core/non_terminal/rule.hpp
deal.II/contrib/boost-1.49.0/include/boost/spirit/core/primitives/numerics.hpp
deal.II/contrib/boost-1.49.0/libs/serialization/src/basic_serializer_map.cpp
deal.II/contrib/boost-1.49.0/libs/thread/src/pthread/once.cpp

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 2100d539efe44e32ab36d10832942060878aabb2..01093669393f77d8974e7f7962e556cb7987edae 100644 (file)
@@ -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 <boost/config.hpp>
 #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 Archive>
-class text_oarchive_impl : 
+class text_oarchive_impl :
      /* protected ? */ public basic_text_oprimitive<std::ostream>,
      public basic_text_oarchive<Archive>
 {
@@ -61,37 +61,37 @@ protected:
         basic_text_oprimitive<std::ostream>::save(t);
     }
     void save(const version_type & t){
-        save(static_cast<const unsigned int>(t));
+        save(static_cast<unsigned int>(t));
     }
     void save(const boost::serialization::item_version_type & t){
-        save(static_cast<const unsigned int>(t));
+        save(static_cast<unsigned int>(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<text_oarchive>
 {
 public:
index 167ba093701955fb5bd9b2813963ae8aac78c4b0..a4ede37a8772fbe039790cb33559d46a77a9c51a 100644 (file)
@@ -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 <cstddef> // size_t
 #include <boost/config.hpp>
 #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 Archive>
-class xml_oarchive_impl : 
+class xml_oarchive_impl :
     public basic_text_oprimitive<std::ostream>,
     public basic_xml_oarchive<Archive>
 {
@@ -62,15 +62,15 @@ protected:
     void save(const T & t){
         basic_text_oprimitive<std::ostream>::save(t);
     }
-    void 
+    void
     save(const version_type & t){
-        save(static_cast<const unsigned int>(t));
+        save(static_cast<unsigned int>(t));
     }
-    void 
+    void
     save(const boost::serialization::item_version_type & t){
-        save(static_cast<const unsigned int>(t));
+        save(static_cast<unsigned int>(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<xml_oarchive>
 {
 public:
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 08059b5d0a180e78f5bc2d728cce022481551044..e6ed07a922c80b897769851cde8984d73b1df185 100644 (file)
@@ -80,6 +80,7 @@ namespace boost
         template<typename Func, unsigned ... indices, typename ... Args>
           R m_invoke(void *, Func &func, unsigned_meta_array<indices...>, std::tuple<Args...> args) const
         {
+         (void)args;
           func(std::get<indices>(args)...);
           return R();
         }
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
 
index 80e805fabd4a4357c4453daeada0ac40539a34c5..886dda6b8e87e1f2cdbf729cad14197d9ffc751d 100644 (file)
@@ -45,6 +45,7 @@ basic_serializer_map::insert(const basic_serializer * bs){
     // attempt to insert serializer into it's map
     const std::pair<map_type::iterator, bool> result =
         m_map.insert(bs);
+    (void)result;
     // the following is commented out - rather than being just
     // deleted as a reminder not to try this.
 
index 6e0466f17ea39c687603b6c3f35bb7343a67285b..a45cc4b0f94c1224c8e6baacbf6dbf5debb6f27b 100644 (file)
@@ -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 <boost/thread/once.hpp>
 #include <boost/assert.hpp>
 #include <pthread.h>

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.