reduce warnings patches

Change-Id: I7a861758236bbae7f82292123ff012de97e2f4de

2 files changed, 1 insertions, 118 deletions

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 966d33af83e1..d73ee501b182 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -34,7 +34,7 @@ endif
 # Clang warnings:
 boost_patches += boost_1_44_0-clang-warnings.patch
 
-boost_patches += boost_1_44_0-gcc4.8.patch
+boost_patches += boost.wunused-local-typedefs.patch
 
 boost_patches += boost.auto_link.patch
 boost_patches += boost.endian.patch
diff --git a/external/boost/boost_1_44_0-gcc4.8.patch b/external/boost/boost.wunused-local-typedefs.patch
index 695f8ac51d87..ced3195cf5cc 100644
--- a/external/boost/boost_1_44_0-gcc4.8.patch
+++ b/external/boost/boost.wunused-local-typedefs.patch
@@ -256,120 +256,3 @@
              typedef typename ScannerT::iterator_t   iterator_t;
  
              iterator_t const s(scan.first);
---- misc/boost_1_44_0/boost/date_time/time_facet.hpp
-+++ misc/build/boost_1_44_0/boost/date_time/time_facet.hpp
-@@ -439,31 +439,31 @@
-                               time_dur_arg.get_rep().as_special());
-       }
- 
--      string_type format(m_time_duration_format);
-+      string_type lcl_format(m_time_duration_format);
-       if (time_dur_arg.is_negative()) {
-         // replace %- with minus sign.  Should we use the numpunct facet?
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       duration_sign_negative_only,
-                                       negative_sign);
-           // remove all the %+ in the string with '-'
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       duration_sign_always,
-                                       negative_sign);
-       }
-       else { //duration is positive
-         // remove all the %- combos from the string
--        boost::algorithm::erase_all(format, duration_sign_negative_only);
-+        boost::algorithm::erase_all(lcl_format, duration_sign_negative_only);
-         // remove all the %+ in the string with '+'
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       duration_sign_always,
-                                       positive_sign);
-       }
- 
-       // %T and %R have to be replaced here since they are not standard
--      boost::algorithm::replace_all(format,
-+      boost::algorithm::replace_all(lcl_format,
-         boost::as_literal(formats_type::full_24_hour_time_format),
-         boost::as_literal(formats_type::full_24_hour_time_expanded_format));
--      boost::algorithm::replace_all(format,
-+      boost::algorithm::replace_all(lcl_format,
-         boost::as_literal(formats_type::short_24_hour_time_format),
-         boost::as_literal(formats_type::short_24_hour_time_expanded_format));
- 
-@@ -476,22 +476,22 @@
-        * here ourself.
-        */
-       string_type hours_str;
--      if (format.find(unrestricted_hours_format) != string_type::npos) {
-+      if (lcl_format.find(unrestricted_hours_format) != string_type::npos) {
-         hours_str = hours_as_string(time_dur_arg);
--        boost::algorithm::replace_all(format, unrestricted_hours_format, hours_str);
-+        boost::algorithm::replace_all(lcl_format, unrestricted_hours_format, hours_str);
-       }
-       // We still have to process restricted hours format specifier. In order to
-       // support parseability of durations in ISO format (%H%M%S), we'll have to
-       // restrict the stringified hours length to 2 characters.
--      if (format.find(hours_format) != string_type::npos) {
-+      if (lcl_format.find(hours_format) != string_type::npos) {
-         if (hours_str.empty())
-           hours_str = hours_as_string(time_dur_arg);
-         BOOST_ASSERT(hours_str.length() <= 2);
--        boost::algorithm::replace_all(format, hours_format, hours_str);
-+        boost::algorithm::replace_all(lcl_format, hours_format, hours_str);
-       }
- 
-       string_type frac_str;
--      if (format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
-+      if (lcl_format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
-         // replace %s with %S.nnn
-         frac_str =
-           fractional_seconds_as_string(time_dur_arg, false);
-@@ -500,21 +500,21 @@
-         string_type replace_string(seconds_format);
-         replace_string += sep;
-         replace_string += frac_str;
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       seconds_with_fractional_seconds_format,
-                                       replace_string);
-       }
--      if (format.find(fractional_seconds_format) != string_type::npos) {
-+      if (lcl_format.find(fractional_seconds_format) != string_type::npos) {
-         // replace %f with nnnnnnn
-         if (!frac_str.size()) {
-           frac_str = fractional_seconds_as_string(time_dur_arg, false);
-         }
--        boost::algorithm::replace_all(format,
-+        boost::algorithm::replace_all(lcl_format,
-                                       fractional_seconds_format,
-                                       frac_str);
-       }
- 
--      if (format.find(fractional_seconds_or_none_format) != string_type::npos) {
-+      if (lcl_format.find(fractional_seconds_or_none_format) != string_type::npos) {
-         // replace %F with nnnnnnn or nothing if fs == 0
-         frac_str =
-           fractional_seconds_as_string(time_dur_arg, true);
-@@ -523,18 +523,18 @@
-           string_type replace_string;
-           replace_string += sep;
-           replace_string += frac_str;
--          boost::algorithm::replace_all(format,
-+          boost::algorithm::replace_all(lcl_format,
-                                         fractional_seconds_or_none_format,
-                                         replace_string);
-         }
-         else {
--          boost::algorithm::erase_all(format,
-+          boost::algorithm::erase_all(lcl_format,
-                                       fractional_seconds_or_none_format);
-         }
-       }
- 
-       return this->do_put_tm(next_arg, ios_arg, fill_arg,
--                       to_tm(time_dur_arg), format);
-+                       to_tm(time_dur_arg), lcl_format);
-     }
- 
-     OutItrT put(OutItrT next, std::ios_base& ios_arg,