boost: split up boost.libcdr.warnings.patch.1

Change-Id: Ie637b6e7f452633a3cfa7826d7add0eb9846f7f8

4 files changed, 111 insertions, 108 deletions

diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index bdc986ed6b49..52c5c836d6c5 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -24,6 +24,8 @@ boost_patches += boost.crc.Wshadow.warnings.patch
 boost_patches += boost.date_time.Wshadow.warnings.patch
 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.ptr_container.Wshadow.warnings.patch
 boost_patches += boost.ptr_container.Wignored-qualifiers.warnings.patch
 boost_patches += boost.ptr_container.Wextra.warnings.patch
@@ -31,7 +33,6 @@ boost_patches += boost.ptr_container.Wunused-parameter.warnings.patch
 boost_patches += boost.random.Wshadow.warnings.patch
 boost_patches += boost.spirit.Wshadow.warnings.patch
 boost_patches += boost.uuid.Wshadow.warnings.patch
-boost_patches += boost.libcdr.warnings.patch.1
 
 # Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
 ifeq (GCC,$(COM))
diff --git a/external/boost/boost.multi_index.Wshadow.warnings.patch.1 b/external/boost/boost.multi_index.Wshadow.warnings.patch.1
new file mode 100644
index 000000000000..58c39c0b1a66
--- /dev/null
+++ b/external/boost/boost.multi_index.Wshadow.warnings.patch.1
@@ -0,0 +1,94 @@
+--- boost/boost/multi_index/sequenced_index.hpp	2008-07-03 18:51:53.000000000 +0200
++++ boost/boost/multi_index/sequenced_index.hpp	2013-05-17 15:44:15.265289335 +0200
+@@ -346,7 +346,7 @@
+   }
+ 
+   template<typename Modifier,typename Rollback>
+-  bool modify(iterator position,Modifier mod,Rollback back)
++  bool modify(iterator position,Modifier mod,Rollback back_)
+   {
+     BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position);
+     BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position);
+@@ -363,7 +363,7 @@
+ #endif
+ 
+     return this->final_modify_(
+-      mod,back,static_cast<final_node_type*>(position.get_node()));
++      mod,back_,static_cast<final_node_type*>(position.get_node()));
+   }
+ 
+   void swap(sequenced_index<SuperMeta,TagList>& x)
+--- boost/boost/multi_index_container.hpp	2010-07-24 11:20:29.000000000 +0200
++++ boost/boost/multi_index_container.hpp	2013-05-17 15:45:56.723899853 +0200
+@@ -360,7 +360,7 @@
+     IteratorType it
+     BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N))
+   {
+-    typedef typename nth_index<N>::type index;
++    typedef typename nth_index<N>::type index_;
+ 
+ #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
+     BOOST_STATIC_ASSERT(
+@@ -371,7 +371,7 @@
+     BOOST_MULTI_INDEX_CHECK_IS_OWNER(
+       it,static_cast<typename IteratorType::container_type&>(*this));
+ 
+-    return index::make_iterator(static_cast<node_type*>(it.get_node()));
++    return index_::make_iterator(static_cast<node_type*>(it.get_node()));
+   }
+ 
+   template<int N,typename IteratorType>
+@@ -379,7 +379,7 @@
+     IteratorType it
+     BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N))const
+   {
+-    typedef typename nth_index<N>::type index;
++    typedef typename nth_index<N>::type index_;
+ 
+ #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
+     BOOST_STATIC_ASSERT((
+@@ -390,7 +390,7 @@
+     BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
+     BOOST_MULTI_INDEX_CHECK_IS_OWNER(
+       it,static_cast<const typename IteratorType::container_type&>(*this));
+-    return index::make_iterator(static_cast<node_type*>(it.get_node()));
++    return index_::make_iterator(static_cast<node_type*>(it.get_node()));
+   }
+ #endif
+ 
+@@ -414,7 +414,7 @@
+     IteratorType it
+     BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))
+   {
+-    typedef typename index<Tag>::type index;
++    typedef typename index<Tag>::type index_;
+ 
+ #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
+     BOOST_STATIC_ASSERT(
+@@ -424,7 +424,7 @@
+     BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
+     BOOST_MULTI_INDEX_CHECK_IS_OWNER(
+       it,static_cast<typename IteratorType::container_type&>(*this));
+-    return index::make_iterator(static_cast<node_type*>(it.get_node()));
++    return index_::make_iterator(static_cast<node_type*>(it.get_node()));
+   }
+ 
+   template<typename Tag,typename IteratorType>
+@@ -432,7 +432,7 @@
+     IteratorType it
+     BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))const
+   {
+-    typedef typename index<Tag>::type index;
++    typedef typename index<Tag>::type index_;
+ 
+ #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
+     BOOST_STATIC_ASSERT((
+@@ -443,7 +443,7 @@
+     BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
+     BOOST_MULTI_INDEX_CHECK_IS_OWNER(
+       it,static_cast<const typename IteratorType::container_type&>(*this));
+-    return index::make_iterator(static_cast<node_type*>(it.get_node()));
++    return index_::make_iterator(static_cast<node_type*>(it.get_node()));
+   }
+ #endif
+ 
diff --git a/external/boost/boost.libcdr.warnings.patch.1 b/external/boost/boost.property_tree.Wshadow.warnings.patch.1
index 12a7ea251015..6a4ab026a541 100644
--- a/external/boost/boost.libcdr.warnings.patch.1
+++ b/external/boost/boost.property_tree.Wshadow.warnings.patch.1
@@ -1,97 +1,3 @@
---- boost/boost/multi_index/sequenced_index.hpp	2008-07-03 18:51:53.000000000 +0200
-+++ boost/boost/multi_index/sequenced_index.hpp	2013-05-17 15:44:15.265289335 +0200
-@@ -346,7 +346,7 @@
-   }
- 
-   template<typename Modifier,typename Rollback>
--  bool modify(iterator position,Modifier mod,Rollback back)
-+  bool modify(iterator position,Modifier mod,Rollback back_)
-   {
-     BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position);
-     BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position);
-@@ -363,7 +363,7 @@
- #endif
- 
-     return this->final_modify_(
--      mod,back,static_cast<final_node_type*>(position.get_node()));
-+      mod,back_,static_cast<final_node_type*>(position.get_node()));
-   }
- 
-   void swap(sequenced_index<SuperMeta,TagList>& x)
---- boost/boost/multi_index_container.hpp	2010-07-24 11:20:29.000000000 +0200
-+++ boost/boost/multi_index_container.hpp	2013-05-17 15:45:56.723899853 +0200
-@@ -360,7 +360,7 @@
-     IteratorType it
-     BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N))
-   {
--    typedef typename nth_index<N>::type index;
-+    typedef typename nth_index<N>::type index_;
- 
- #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
-     BOOST_STATIC_ASSERT(
-@@ -371,7 +371,7 @@
-     BOOST_MULTI_INDEX_CHECK_IS_OWNER(
-       it,static_cast<typename IteratorType::container_type&>(*this));
- 
--    return index::make_iterator(static_cast<node_type*>(it.get_node()));
-+    return index_::make_iterator(static_cast<node_type*>(it.get_node()));
-   }
- 
-   template<int N,typename IteratorType>
-@@ -379,7 +379,7 @@
-     IteratorType it
-     BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N))const
-   {
--    typedef typename nth_index<N>::type index;
-+    typedef typename nth_index<N>::type index_;
- 
- #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
-     BOOST_STATIC_ASSERT((
-@@ -390,7 +390,7 @@
-     BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
-     BOOST_MULTI_INDEX_CHECK_IS_OWNER(
-       it,static_cast<const typename IteratorType::container_type&>(*this));
--    return index::make_iterator(static_cast<node_type*>(it.get_node()));
-+    return index_::make_iterator(static_cast<node_type*>(it.get_node()));
-   }
- #endif
- 
-@@ -414,7 +414,7 @@
-     IteratorType it
-     BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))
-   {
--    typedef typename index<Tag>::type index;
-+    typedef typename index<Tag>::type index_;
- 
- #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
-     BOOST_STATIC_ASSERT(
-@@ -424,7 +424,7 @@
-     BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
-     BOOST_MULTI_INDEX_CHECK_IS_OWNER(
-       it,static_cast<typename IteratorType::container_type&>(*this));
--    return index::make_iterator(static_cast<node_type*>(it.get_node()));
-+    return index_::make_iterator(static_cast<node_type*>(it.get_node()));
-   }
- 
-   template<typename Tag,typename IteratorType>
-@@ -432,7 +432,7 @@
-     IteratorType it
-     BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))const
-   {
--    typedef typename index<Tag>::type index;
-+    typedef typename index<Tag>::type index_;
- 
- #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
-     BOOST_STATIC_ASSERT((
-@@ -443,7 +443,7 @@
-     BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
-     BOOST_MULTI_INDEX_CHECK_IS_OWNER(
-       it,static_cast<const typename IteratorType::container_type&>(*this));
--    return index::make_iterator(static_cast<node_type*>(it.get_node()));
-+    return index_::make_iterator(static_cast<node_type*>(it.get_node()));
-   }
- #endif
- 
 --- boost/boost/property_tree/detail/json_parser_error.hpp	2007-05-13 00:02:53.000000000 +0200
 +++ boost/boost/property_tree/detail/json_parser_error.hpp	2013-05-17 15:36:44.605902442 +0200
 @@ -20,10 +20,10 @@
@@ -427,16 +333,4 @@
                     typename translator_between<data_type, Type>::type());
      }
  
---- boost/boost/spirit/home/classic/error_handling/exceptions.hpp	2013-05-17 15:57:23.722638823 +0200
-+++ boost/boost/spirit/home/classic/error_handling/exceptions.hpp	2013-05-17 15:26:32.319247352 +0200
-@@ -126,8 +126,8 @@
-         typedef unary<ParserT, parser<self_t> >         base_t;
-         typedef unary_parser_category                   parser_category_t;
- 
--        assertive_parser(ParserT const& parser, ErrorDescrT descriptor_)
--        : base_t(parser), descriptor(descriptor_) {}
-+        assertive_parser(ParserT const& parser_, ErrorDescrT descriptor_)
-+        : base_t(parser_), descriptor(descriptor_) {}
- 
-         template <typename ScannerT>
-         struct result
+
diff --git a/external/boost/boost.spirit.Wshadow.warnings.patch b/external/boost/boost.spirit.Wshadow.warnings.patch
index 3b4807715679..ab8a526241c8 100644
--- a/external/boost/boost.spirit.Wshadow.warnings.patch
+++ b/external/boost/boost.spirit.Wshadow.warnings.patch
@@ -55,3 +55,17 @@
 +                    rule_info(std::string(name_to_register), trace_node_))
                  ).second;
              }
+ 
+--- a/a/boost/boost/spirit/home/classic/error_handling/exceptions.hpp	2013-05-17 15:57:23.722638823 +0200
++++ a/a/boost/boost/spirit/home/classic/error_handling/exceptions.hpp	2013-05-17 15:26:32.319247352 +0200
+@@ -126,8 +126,8 @@
+         typedef unary<ParserT, parser<self_t> >         base_t;
+         typedef unary_parser_category                   parser_category_t;
+ 
+-        assertive_parser(ParserT const& parser, ErrorDescrT descriptor_)
+-        : base_t(parser), descriptor(descriptor_) {}
++        assertive_parser(ParserT const& parser_, ErrorDescrT descriptor_)
++        : base_t(parser_), descriptor(descriptor_) {}
+ 
+         template <typename ScannerT>
+         struct result