Ticket #11507: boost_1_59_0.property_tree.wshadow.patch

boost/property_tree/detail/json_parser/parser.hpp

@@ -22 +22 @@
             code_unit;
         typedef bool (Encoding::*encoding_predicate)(code_unit c) const;
 
-        explicit source(Encoding& encoding) : encoding(encoding) {}
+        explicit source(Encoding& encoding_) : encoding(encoding_) {}
 
         template <typename Range>
-        void set_input(const std::string& filename, const Range& r)
+        void set_input(const std::string& filename_, const Range& r)
         {
-            this->filename = filename;
+            this->filename = filename_;
             cur = r.begin();
             end = r.end();
             line = 1;
@@ -107 +107 @@
     class number_callback_adapter
     {
     public:
-        number_callback_adapter(Callbacks& callbacks, Encoding& encoding,
-                                Iterator& cur)
-            : callbacks(callbacks), encoding(encoding), first(cur), cur(cur)
+        number_callback_adapter(Callbacks& callbacks_, Encoding& encoding_,
+                                Iterator& cur_)
+            : callbacks(callbacks_), encoding(encoding_), first(cur_), cur(cur_)
         {}
 
         void operator ()(typename Encoding::external_char) {}
@@ -132 +132 @@
                                   std::input_iterator_tag>
     {
     public:
-        number_callback_adapter(Callbacks& callbacks, Encoding& encoding,
+        number_callback_adapter(Callbacks& callbacks_, Encoding& encoding_,
                                 Iterator&)
-            : callbacks(callbacks), encoding(encoding), first(true)
+            : callbacks(callbacks_), encoding(encoding_), first(true)
         {}
 
         void operator ()(typename Encoding::external_char c) {
@@ -162 +162 @@
     class string_callback_adapter
     {
     public:
-        string_callback_adapter(Callbacks& callbacks, Encoding& encoding,
-                                Iterator& cur)
-            : callbacks(callbacks), encoding(encoding), cur(cur),
-              run_begin(cur)
+        string_callback_adapter(Callbacks& callbacks_, Encoding& encoding_,
+                                Iterator& cur_)
+            : callbacks(callbacks_), encoding(encoding_), cur(cur_),
+              run_begin(cur_)
         {}
 
         void start_run() {
@@ -195 +195 @@
                                   std::input_iterator_tag>
     {
     public:
-        string_callback_adapter(Callbacks& callbacks, Encoding& encoding,
-                                Iterator& cur)
-            : callbacks(callbacks), encoding(encoding), cur(cur)
+        string_callback_adapter(Callbacks& callbacks_, Encoding& encoding_,
+                                Iterator& cur_)
+            : callbacks(callbacks_), encoding(encoding_), cur(cur_)
         {}
 
         void start_run() {}
@@ -232 +232 @@
                 typedef typename source::code_unit code_unit;
 
         public:
-                parser(Callbacks& callbacks, Encoding& encoding)
-                        : callbacks(callbacks), encoding(encoding), src(encoding)
+                parser(Callbacks& callbacks_, Encoding& encoding_)
+                        : callbacks(callbacks_), encoding(encoding_), src(encoding_)
                 {}
 
                 template <typename Range>