boost: split up boost.jsonparser.warnings.patch.0

Change-Id: I680a19b87708459501816cb7de228468f167caa9

4 files changed, 74 insertions, 75 deletions

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 52c5c836d6c5..3dee630e4497 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -10,6 +10,8 @@
 boost_patches :=
 #https://svn.boost.org/trac/boost/ticket/3780
 boost_patches += boost.3780.aliasing.patch
+#https://svn.boost.org/trac/boost/ticket/9397
+boost_patches += boost.9397.warnings.patch.0
 #http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679
 boost_patches += boost.gcc47679.patch
 #https://svn.boost.org/trac/boost/ticket/6369
@@ -26,6 +28,7 @@ boost_patches += boost.multi_array.C4510.warnings.patch
 boost_patches += boost.multi_array.Wshadow.warnings.patch
 boost_patches += boost.multi_index.Wshadow.warnings.patch.1
 boost_patches += boost.property_tree.Wshadow.warnings.patch.1
+boost_patches += boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0
 boost_patches += boost.ptr_container.Wshadow.warnings.patch
 boost_patches += boost.ptr_container.Wignored-qualifiers.warnings.patch
 boost_patches += boost.ptr_container.Wextra.warnings.patch
@@ -55,9 +58,6 @@ boost_patches += boost.wshadow.patch
 boost_patches += boost.wdeprecated-register.patch.0
 boost_patches += boost.wuninitialized.patch
 boost_patches += boost.wdeprecated-auto_ptr.patch.0
-#https://svn.boost.org/trac/boost/ticket/9397
-boost_patches += boost.9397.warnings.patch.0
-boost_patches += boost.jsonparser.warnings.patch.0
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
diff --git a/external/boost/boost.jsonparser.warnings.patch.0 b/external/boost/boost.jsonparser.warnings.patch.0
deleted file mode 100644
index 0cda6ea43e68..000000000000
--- a/external/boost/boost.jsonparser.warnings.patch.0
+++ /dev/null
@@ -1,69 +0,0 @@
---- boost/property_tree/string_path.hpp
-+++ boost/property_tree/string_path.hpp
-@@ -88,14 +88,14 @@ namespace boost { namespace property_tree
-         typedef typename String::value_type char_type;
-
-         /// Create an empty path.
--        explicit string_path(char_type separator = char_type('.'));
-+        explicit string_path(char_type separator_ = char_type('.'));
-         /// Create a path by parsing the given string.
-         /// @param value A sequence, possibly with separators, that describes
-         ///              the path, e.g. "one.two.three".
-         /// @param separator The separator used in parsing. Defaults to '.'.
-         /// @param tr The translator used by this path to convert the individual
-         ///           parts to keys.
--        string_path(const String &value, char_type separator = char_type('.'),
-+        string_path(const String &value, char_type separator_ = char_type('.'),
-                     Translator tr = Translator());
-         /// Create a path by parsing the given string.
-         /// @param value A zero-terminated array of values. Only use if zero-
-@@ -106,7 +106,7 @@ namespace boost { namespace property_tree
-         /// @param tr The translator used by this path to convert the individual
-         ///           parts to keys.
-         string_path(const char_type *value,
--                    char_type separator = char_type('.'),
-+                    char_type separator_ = char_type('.'),
-                     Translator tr = Translator());
-
-         // Default copying doesn't do the right thing with the iterator
-@@ -162,23 +162,23 @@ namespace boost { namespace property_tree
-     };
-
-     template <typename String, typename Translator> inline
--    string_path<String, Translator>::string_path(char_type separator)
--        : m_separator(separator), m_start(m_value.begin())
-+    string_path<String, Translator>::string_path(char_type separator_)
-+        : m_separator(separator_), m_start(m_value.begin())
-     {}
-
-     template <typename String, typename Translator> inline
-     string_path<String, Translator>::string_path(const String &value,
--                                                 char_type separator,
-+                                                 char_type separator_,
-                                                  Translator tr)
--        : m_value(value), m_separator(separator),
-+        : m_value(value), m_separator(separator_),
-           m_tr(tr), m_start(m_value.begin())
-     {}
-
-     template <typename String, typename Translator> inline
-     string_path<String, Translator>::string_path(const char_type *value,
--                                                 char_type separator,
-+                                                 char_type separator_,
-                                                  Translator tr)
--        : m_value(value), m_separator(separator),
-+        : m_value(value), m_separator(separator_),
-           m_tr(tr), m_start(m_value.begin())
-     {}
-
---- boost/property_tree/detail/json_parser_write.hpp
-+++ boost/property_tree/detail/json_parser_write.hpp
-@@ -33,7 +33,7 @@
-             // 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 && static_cast<typename std::basic_string<Ch>::traits_type::int_type>(*b) <= 0xFF))
-                 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/external/boost/boost.property_tree.Wshadow.warnings.patch.1 b/external/boost/boost.property_tree.Wshadow.warnings.patch.1
index 6a4ab026a541..65e4caeecc90 100644
--- a/external/boost/boost.property_tree.Wshadow.warnings.patch.1
+++ b/external/boost/boost.property_tree.Wshadow.warnings.patch.1
@@ -8,9 +8,9 @@
 -                          const std::string &filename, 
 -                          unsigned long line): 
 -            file_parser_error(message, filename, line)
-+        json_parser_error(const std::string &message_, 
-+                          const std::string &filename_, 
-+                          unsigned long line_): 
++        json_parser_error(const std::string &message_,
++                          const std::string &filename_,
++                          unsigned long line_):
 +            file_parser_error(message_, filename_, line_)
          { 
          }
@@ -333,4 +333,61 @@
                     typename translator_between<data_type, Type>::type());
      }
  
+--- a/boost/property_tree/string_path.hpp
++++ a/boost/property_tree/string_path.hpp
+@@ -88,14 +88,14 @@ namespace boost { namespace property_tree
+         typedef typename String::value_type char_type;
+
+         /// Create an empty path.
+-        explicit string_path(char_type separator = char_type('.'));
++        explicit string_path(char_type separator_ = char_type('.'));
+         /// Create a path by parsing the given string.
+         /// @param value A sequence, possibly with separators, that describes
+         ///              the path, e.g. "one.two.three".
+         /// @param separator The separator used in parsing. Defaults to '.'.
+         /// @param tr The translator used by this path to convert the individual
+         ///           parts to keys.
+-        string_path(const String &value, char_type separator = char_type('.'),
++        string_path(const String &value, char_type separator_ = char_type('.'),
+                     Translator tr = Translator());
+         /// Create a path by parsing the given string.
+         /// @param value A zero-terminated array of values. Only use if zero-
+@@ -106,7 +106,7 @@ namespace boost { namespace property_tree
+         /// @param tr The translator used by this path to convert the individual
+         ///           parts to keys.
+         string_path(const char_type *value,
+-                    char_type separator = char_type('.'),
++                    char_type separator_ = char_type('.'),
+                     Translator tr = Translator());
+
+         // Default copying doesn't do the right thing with the iterator
+@@ -162,23 +162,23 @@ namespace boost { namespace property_tree
+     };
+
+     template <typename String, typename Translator> inline
+-    string_path<String, Translator>::string_path(char_type separator)
+-        : m_separator(separator), m_start(m_value.begin())
++    string_path<String, Translator>::string_path(char_type separator_)
++        : m_separator(separator_), m_start(m_value.begin())
+     {}
+
+     template <typename String, typename Translator> inline
+     string_path<String, Translator>::string_path(const String &value,
+-                                                 char_type separator,
++                                                 char_type separator_,
+                                                  Translator tr)
+-        : m_value(value), m_separator(separator),
++        : m_value(value), m_separator(separator_),
+           m_tr(tr), m_start(m_value.begin())
+     {}
+
+     template <typename String, typename Translator> inline
+     string_path<String, Translator>::string_path(const char_type *value,
+-                                                 char_type separator,
++                                                 char_type separator_,
+                                                  Translator tr)
+-        : m_value(value), m_separator(separator),
++        : m_value(value), m_separator(separator_),
+           m_tr(tr), m_start(m_value.begin())
+     {}
 
diff --git a/external/boost/boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0 b/external/boost/boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0
new file mode 100644
index 000000000000..4ad7b9be4c38
--- /dev/null
+++ b/external/boost/boost.property_tree.Wtautological-constant-out-of-range-compare.warnings.patch.0
@@ -0,0 +1,11 @@
+--- boost/property_tree/detail/json_parser_write.hpp
++++ boost/property_tree/detail/json_parser_write.hpp
+@@ -33,7 +33,7 @@
+             // 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 && static_cast<typename std::basic_string<Ch>::traits_type::int_type>(*b) <= 0xFF))
+                 result += *b;
+             else if (*b == Ch('\b')) result += Ch('\\'), result += Ch('b');
+             else if (*b == Ch('\f')) result += Ch('\\'), result += Ch('f');