Fix shadow warnings

d-frey · d-frey · commit 415f9ae6ee2b · 2017-06-27T20:16:46.000+02:00
diff --git a/include/tao/json/events/cbor/to_stream.hpp b/include/tao/json/events/cbor/to_stream.hpp
@@ -27,8 +27,8 @@ namespace tao
                std::ostream& os;
 
             public:
-               explicit to_stream( std::ostream& os ) noexcept
-                  : os( os )
+               explicit to_stream( std::ostream& in_os ) noexcept
+                  : os( in_os )
                {
                }
 
diff --git a/include/tao/json/events/debug.hpp b/include/tao/json/events/debug.hpp
@@ -31,8 +31,8 @@ namespace tao
             std::ostream& os;
 
          public:
-            explicit debug( std::ostream& os ) noexcept
-               : os( os )
+            explicit debug( std::ostream& in_os ) noexcept
+               : os( in_os )
             {
             }
 
diff --git a/include/tao/json/events/msgpack/to_stream.hpp b/include/tao/json/events/msgpack/to_stream.hpp
@@ -26,8 +26,8 @@ namespace tao
                std::ostream& os;
 
             public:
-               explicit to_stream( std::ostream& os ) noexcept
-                  : os( os )
+               explicit to_stream( std::ostream& in_os ) noexcept
+                  : os( in_os )
                {
                }
 
diff --git a/include/tao/json/events/to_pretty_stream.hpp b/include/tao/json/events/to_pretty_stream.hpp
@@ -49,9 +49,9 @@ namespace tao
             }
 
          public:
-            to_pretty_stream( std::ostream& os, const std::size_t indent )
-               : os( os ),
-                 indent( indent ),
+            to_pretty_stream( std::ostream& in_os, const std::size_t in_indent )
+               : os( in_os ),
+                 indent( in_indent ),
                  first( true )
             {
             }
diff --git a/include/tao/json/events/to_stream.hpp b/include/tao/json/events/to_stream.hpp
@@ -39,8 +39,8 @@ namespace tao
             }
 
          public:
-            explicit to_stream( std::ostream& os ) noexcept
-               : os( os ),
+            explicit to_stream( std::ostream& in_os ) noexcept
+               : os( in_os ),
                  first( true )
             {
             }
diff --git a/include/tao/json/events/ubjson/to_stream.hpp b/include/tao/json/events/ubjson/to_stream.hpp
@@ -26,8 +26,8 @@ namespace tao
                std::ostream& os;
 
             public:
-               explicit to_stream( std::ostream& os ) noexcept
-                  : os( os )
+               explicit to_stream( std::ostream& in_os ) noexcept
+                  : os( in_os )
                {
                }
 
diff --git a/include/tao/json/internal/sha256.hpp b/include/tao/json/internal/sha256.hpp
@@ -189,15 +189,15 @@ namespace tao
 
                process();
 
-               for( std::size_t i = 0; i < 4; ++i ) {
-                  buffer[ i ] = ( H[ 0 ] >> ( 24 - i * 8 ) ) & 0xff;
-                  buffer[ i + 4 ] = ( H[ 1 ] >> ( 24 - i * 8 ) ) & 0xff;
-                  buffer[ i + 8 ] = ( H[ 2 ] >> ( 24 - i * 8 ) ) & 0xff;
-                  buffer[ i + 12 ] = ( H[ 3 ] >> ( 24 - i * 8 ) ) & 0xff;
-                  buffer[ i + 16 ] = ( H[ 4 ] >> ( 24 - i * 8 ) ) & 0xff;
-                  buffer[ i + 20 ] = ( H[ 5 ] >> ( 24 - i * 8 ) ) & 0xff;
-                  buffer[ i + 24 ] = ( H[ 6 ] >> ( 24 - i * 8 ) ) & 0xff;
-                  buffer[ i + 28 ] = ( H[ 7 ] >> ( 24 - i * 8 ) ) & 0xff;
+               for( std::size_t j = 0; j < 4; ++j ) {
+                  buffer[ j ] = ( H[ 0 ] >> ( 24 - j * 8 ) ) & 0xff;
+                  buffer[ j + 4 ] = ( H[ 1 ] >> ( 24 - j * 8 ) ) & 0xff;
+                  buffer[ j + 8 ] = ( H[ 2 ] >> ( 24 - j * 8 ) ) & 0xff;
+                  buffer[ j + 12 ] = ( H[ 3 ] >> ( 24 - j * 8 ) ) & 0xff;
+                  buffer[ j + 16 ] = ( H[ 4 ] >> ( 24 - j * 8 ) ) & 0xff;
+                  buffer[ j + 20 ] = ( H[ 5 ] >> ( 24 - j * 8 ) ) & 0xff;
+                  buffer[ j + 24 ] = ( H[ 6 ] >> ( 24 - j * 8 ) ) & 0xff;
+                  buffer[ j + 28 ] = ( H[ 7 ] >> ( 24 - j * 8 ) ) & 0xff;
                }
             }
 
diff --git a/include/tao/json/patch.hpp b/include/tao/json/patch.hpp
@@ -15,35 +15,35 @@ namespace tao
    namespace json
    {
       template< template< typename... > class Traits >
-      void patch_inplace( basic_value< Traits >& value, const basic_value< Traits >& patch )
+      void patch_inplace( basic_value< Traits >& v, const basic_value< Traits >& patch )
       {
          for( const auto& entry : patch.get_array() ) {
             const auto& op = entry.at( "op" ).get_string();
             const auto& path = entry.at( "path" ).get_string();
             const pointer path_pointer( path );
             if( op == "test" ) {
-               if( value.at( path_pointer ) != entry.at( "value" ) ) {
+               if( v.at( path_pointer ) != entry.at( "value" ) ) {
                   throw std::runtime_error( "test failed for: " + path );
                }
             }
             else if( op == "remove" ) {
-               value.erase( path_pointer );
+               v.erase( path_pointer );
             }
             else if( op == "add" ) {
-               value.insert( path_pointer, entry.at( "value" ) );
+               v.insert( path_pointer, entry.at( "value" ) );
             }
             else if( op == "replace" ) {
-               value.at( path_pointer ) = entry.at( "value" );
+               v.at( path_pointer ) = entry.at( "value" );
             }
             else if( op == "move" ) {
                const pointer from( entry.at( "from" ).get_string() );
-               auto v = std::move( value.at( from ) );
-               value.erase( from );
-               value.insert( path_pointer, std::move( v ) );
+               auto t = std::move( v.at( from ) );
+               v.erase( from );
+               v.insert( path_pointer, std::move( t ) );
             }
             else if( op == "copy" ) {
                const pointer from( entry.at( "from" ).get_string() );
-               value.insert( path_pointer, value.at( from ) );
+               v.insert( path_pointer, v.at( from ) );
             }
             else {
                throw std::runtime_error( "unknown patch operation: '" + op + '\'' );
@@ -52,35 +52,35 @@ namespace tao
       }
 
       template< template< typename... > class Traits >
-      void patch_inplace( basic_value< Traits >& value, basic_value< Traits >&& patch )
+      void patch_inplace( basic_value< Traits >& v, basic_value< Traits >&& patch )
       {
          for( const auto& entry : patch.get_array() ) {
             const auto& op = entry.at( "op" ).get_string();
             const auto& path = entry.at( "path" ).get_string();
             const pointer path_pointer( path );
             if( op == "test" ) {
-               if( value.at( path_pointer ) != entry.at( "value" ) ) {
+               if( v.at( path_pointer ) != entry.at( "value" ) ) {
                   throw std::runtime_error( "test failed for: " + path );
                }
             }
             else if( op == "remove" ) {
-               value.erase( path_pointer );
+               v.erase( path_pointer );
             }
             else if( op == "add" ) {
-               value.insert( path_pointer, std::move( entry.at( "value" ) ) );
+               v.insert( path_pointer, std::move( entry.at( "value" ) ) );
             }
             else if( op == "replace" ) {
-               value.at( path_pointer ) = std::move( entry.at( "value" ) );
+               v.at( path_pointer ) = std::move( entry.at( "value" ) );
             }
             else if( op == "move" ) {
                const pointer from( entry.at( "from" ).get_string() );
-               auto v = std::move( value.at( from ) );
-               value.erase( from );
-               value.insert( path_pointer, std::move( v ) );
+               auto t = std::move( v.at( from ) );
+               v.erase( from );
+               v.insert( path_pointer, std::move( t ) );
             }
             else if( op == "copy" ) {
                const pointer from( entry.at( "from" ).get_string() );
-               value.insert( path_pointer, value.at( from ) );
+               v.insert( path_pointer, v.at( from ) );
             }
             else {
                throw std::runtime_error( "unknown patch operation: '" + op + '\'' );
@@ -89,17 +89,17 @@ namespace tao
       }
 
       template< template< typename... > class Traits >
-      basic_value< Traits > patch( basic_value< Traits > value, const basic_value< Traits >& patch )
+      basic_value< Traits > patch( basic_value< Traits > v, const basic_value< Traits >& patch )
       {
-         patch_inplace( value, patch );
-         return std::move( value );
+         patch_inplace( v, patch );
+         return std::move( v );
       }
 
       template< template< typename... > class Traits >
-      basic_value< Traits > patch( basic_value< Traits > value, basic_value< Traits >&& patch )
+      basic_value< Traits > patch( basic_value< Traits > v, basic_value< Traits >&& patch )
       {
-         patch_inplace( value, std::move( patch ) );
-         return std::move( value );
+         patch_inplace( v, std::move( patch ) );
+         return std::move( v );
       }
 
    }  // namespace json
diff --git a/include/tao/json/reference.hpp b/include/tao/json/reference.hpp
@@ -69,8 +69,8 @@ namespace tao
                                     p = p->at( it->index() ).skip_raw_ptr();
                                     break;
                                  case type::OBJECT:
-                                    if( const auto* r = p->find( "$ref" ) ) {
-                                       if( r->is_string() ) {
+                                    if( const auto* t = p->find( "$ref" ) ) {
+                                       if( t->is_string() ) {
                                           throw std::runtime_error( "invalid JSON Reference: referencing additional data members is invalid" );
                                        }
                                     }
diff --git a/include/tao/json/schema.hpp b/include/tao/json/schema.hpp
@@ -727,8 +727,8 @@ namespace tao
                      try {
                         m_pattern_properties.emplace_back( std::regex( e.first ), e.second.skip_raw_ptr() );
                      }
-                     catch( const std::regex_error& e ) {
-                        throw std::runtime_error( "invalid JSON Schema: keys in object \"patternProperties\" must be regular expressions: " + std::string( e.what() ) );
+                     catch( const std::regex_error& ex ) {
+                        throw std::runtime_error( "invalid JSON Schema: keys in object \"patternProperties\" must be regular expressions: " + std::string( ex.what() ) );
                      }
                      m_referenced_pointers.insert( e.second.skip_raw_ptr() );
                   }
diff --git a/include/tao/json/value.hpp b/include/tao/json/value.hpp
@@ -605,10 +605,10 @@ namespace tao
                   return v.m_union.a.at( i );
                } break;
                case json::type::OBJECT: {
-                  const auto& k = e->key();
-                  const auto it = v.m_union.o.find( k );
+                  const auto& key = e->key();
+                  const auto it = v.m_union.o.find( key );
                   if( it == v.m_union.o.end() ) {
-                     const auto r = v.unsafe_emplace( k, std::move( value ) );
+                     const auto r = v.unsafe_emplace( key, std::move( value ) );
                      assert( r.second );
                      return r.first->second;
                   }
@@ -894,10 +894,10 @@ namespace tao
                   return v.at( e->index() );
                } break;
                case json::type::OBJECT: {
-                  const auto& k = e->key();
-                  const auto it = v.m_union.o.find( k );
+                  const auto& key = e->key();
+                  const auto it = v.m_union.o.find( key );
                   if( it == v.m_union.o.end() ) {
-                     const auto r = v.unsafe_emplace( k, null );
+                     const auto r = v.unsafe_emplace( key, null );
                      assert( r.second );
                      return r.first->second;
                   }

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ namespace tao`
`27`	`27`	`std::ostream& os;`
`28`	`28`
`29`	`29`	`public:`
`30`		`- explicit to_stream( std::ostream& os ) noexcept`
`31`		`- : os( os )`
	`30`	`+ explicit to_stream( std::ostream& in_os ) noexcept`
	`31`	`+ : os( in_os )`
`32`	`32`	`{`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ namespace tao`
`31`	`31`	`std::ostream& os;`
`32`	`32`
`33`	`33`	`public:`
`34`		`- explicit debug( std::ostream& os ) noexcept`
`35`		`- : os( os )`
	`34`	`+ explicit debug( std::ostream& in_os ) noexcept`
	`35`	`+ : os( in_os )`
`36`	`36`	`{`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ namespace tao`
`26`	`26`	`std::ostream& os;`
`27`	`27`
`28`	`28`	`public:`
`29`		`- explicit to_stream( std::ostream& os ) noexcept`
`30`		`- : os( os )`
	`29`	`+ explicit to_stream( std::ostream& in_os ) noexcept`
	`30`	`+ : os( in_os )`
`31`	`31`	`{`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ namespace tao`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public:`
`52`		`- to_pretty_stream( std::ostream& os, const std::size_t indent )`
`53`		`- : os( os ),`
`54`		`- indent( indent ),`
	`52`	`+ to_pretty_stream( std::ostream& in_os, const std::size_t in_indent )`
	`53`	`+ : os( in_os ),`
	`54`	`+ indent( in_indent ),`
`55`	`55`	`first( true )`
`56`	`56`	`{`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ namespace tao`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public:`
`42`		`- explicit to_stream( std::ostream& os ) noexcept`
`43`		`- : os( os ),`
	`42`	`+ explicit to_stream( std::ostream& in_os ) noexcept`
	`43`	`+ : os( in_os ),`
`44`	`44`	`first( true )`
`45`	`45`	`{`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,35 +15,35 @@ namespace tao`
`15`	`15`	`namespace json`
`16`	`16`	`{`
`17`	`17`	`template< template< typename... > class Traits >`
`18`		`- void patch_inplace( basic_value< Traits >& value, const basic_value< Traits >& patch )`
	`18`	`+ void patch_inplace( basic_value< Traits >& v, const basic_value< Traits >& patch )`
`19`	`19`	`{`
`20`	`20`	`for( const auto& entry : patch.get_array() ) {`
`21`	`21`	`const auto& op = entry.at( "op" ).get_string();`
`22`	`22`	`const auto& path = entry.at( "path" ).get_string();`
`23`	`23`	`const pointer path_pointer( path );`
`24`	`24`	`if( op == "test" ) {`
`25`		`- if( value.at( path_pointer ) != entry.at( "value" ) ) {`
	`25`	`+ if( v.at( path_pointer ) != entry.at( "value" ) ) {`
`26`	`26`	`throw std::runtime_error( "test failed for: " + path );`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`else if( op == "remove" ) {`
`30`		`- value.erase( path_pointer );`
	`30`	`+ v.erase( path_pointer );`
`31`	`31`	`}`
`32`	`32`	`else if( op == "add" ) {`
`33`		`- value.insert( path_pointer, entry.at( "value" ) );`
	`33`	`+ v.insert( path_pointer, entry.at( "value" ) );`
`34`	`34`	`}`
`35`	`35`	`else if( op == "replace" ) {`
`36`		`- value.at( path_pointer ) = entry.at( "value" );`
	`36`	`+ v.at( path_pointer ) = entry.at( "value" );`
`37`	`37`	`}`
`38`	`38`	`else if( op == "move" ) {`
`39`	`39`	`const pointer from( entry.at( "from" ).get_string() );`
`40`		`- auto v = std::move( value.at( from ) );`
`41`		`- value.erase( from );`
`42`		`- value.insert( path_pointer, std::move( v ) );`
	`40`	`+ auto t = std::move( v.at( from ) );`
	`41`	`+ v.erase( from );`
	`42`	`+ v.insert( path_pointer, std::move( t ) );`
`43`	`43`	`}`
`44`	`44`	`else if( op == "copy" ) {`
`45`	`45`	`const pointer from( entry.at( "from" ).get_string() );`
`46`		`- value.insert( path_pointer, value.at( from ) );`
	`46`	`+ v.insert( path_pointer, v.at( from ) );`
`47`	`47`	`}`
`48`	`48`	`else {`
`49`	`49`	`throw std::runtime_error( "unknown patch operation: '" + op + '\'' );`
`@@ -52,35 +52,35 @@ namespace tao`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`template< template< typename... > class Traits >`
`55`		`- void patch_inplace( basic_value< Traits >& value, basic_value< Traits >&& patch )`
	`55`	`+ void patch_inplace( basic_value< Traits >& v, basic_value< Traits >&& patch )`
`56`	`56`	`{`
`57`	`57`	`for( const auto& entry : patch.get_array() ) {`
`58`	`58`	`const auto& op = entry.at( "op" ).get_string();`
`59`	`59`	`const auto& path = entry.at( "path" ).get_string();`
`60`	`60`	`const pointer path_pointer( path );`
`61`	`61`	`if( op == "test" ) {`
`62`		`- if( value.at( path_pointer ) != entry.at( "value" ) ) {`
	`62`	`+ if( v.at( path_pointer ) != entry.at( "value" ) ) {`
`63`	`63`	`throw std::runtime_error( "test failed for: " + path );`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`else if( op == "remove" ) {`
`67`		`- value.erase( path_pointer );`
	`67`	`+ v.erase( path_pointer );`
`68`	`68`	`}`
`69`	`69`	`else if( op == "add" ) {`
`70`		`- value.insert( path_pointer, std::move( entry.at( "value" ) ) );`
	`70`	`+ v.insert( path_pointer, std::move( entry.at( "value" ) ) );`
`71`	`71`	`}`
`72`	`72`	`else if( op == "replace" ) {`
`73`		`- value.at( path_pointer ) = std::move( entry.at( "value" ) );`
	`73`	`+ v.at( path_pointer ) = std::move( entry.at( "value" ) );`
`74`	`74`	`}`
`75`	`75`	`else if( op == "move" ) {`
`76`	`76`	`const pointer from( entry.at( "from" ).get_string() );`
`77`		`- auto v = std::move( value.at( from ) );`
`78`		`- value.erase( from );`
`79`		`- value.insert( path_pointer, std::move( v ) );`
	`77`	`+ auto t = std::move( v.at( from ) );`
	`78`	`+ v.erase( from );`
	`79`	`+ v.insert( path_pointer, std::move( t ) );`
`80`	`80`	`}`
`81`	`81`	`else if( op == "copy" ) {`
`82`	`82`	`const pointer from( entry.at( "from" ).get_string() );`
`83`		`- value.insert( path_pointer, value.at( from ) );`
	`83`	`+ v.insert( path_pointer, v.at( from ) );`
`84`	`84`	`}`
`85`	`85`	`else {`
`86`	`86`	`throw std::runtime_error( "unknown patch operation: '" + op + '\'' );`
`@@ -89,17 +89,17 @@ namespace tao`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`template< template< typename... > class Traits >`
`92`		`- basic_value< Traits > patch( basic_value< Traits > value, const basic_value< Traits >& patch )`
	`92`	`+ basic_value< Traits > patch( basic_value< Traits > v, const basic_value< Traits >& patch )`
`93`	`93`	`{`
`94`		`- patch_inplace( value, patch );`
`95`		`- return std::move( value );`
	`94`	`+ patch_inplace( v, patch );`
	`95`	`+ return std::move( v );`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`template< template< typename... > class Traits >`
`99`		`- basic_value< Traits > patch( basic_value< Traits > value, basic_value< Traits >&& patch )`
	`99`	`+ basic_value< Traits > patch( basic_value< Traits > v, basic_value< Traits >&& patch )`
`100`	`100`	`{`
`101`		`- patch_inplace( value, std::move( patch ) );`
`102`		`- return std::move( value );`
	`101`	`+ patch_inplace( v, std::move( patch ) );`
	`102`	`+ return std::move( v );`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`} // namespace json`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ namespace tao`
`69`	`69`	`p = p->at( it->index() ).skip_raw_ptr();`
`70`	`70`	`break;`
`71`	`71`	`case type::OBJECT:`
`72`		`- if( const auto* r = p->find( "$ref" ) ) {`
`73`		`- if( r->is_string() ) {`
	`72`	`+ if( const auto* t = p->find( "$ref" ) ) {`
	`73`	`+ if( t->is_string() ) {`
`74`	`74`	`throw std::runtime_error( "invalid JSON Reference: referencing additional data members is invalid" );`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -727,8 +727,8 @@ namespace tao`
`727`	`727`	`try {`
`728`	`728`	`m_pattern_properties.emplace_back( std::regex( e.first ), e.second.skip_raw_ptr() );`
`729`	`729`	`}`
`730`		`- catch( const std::regex_error& e ) {`
`731`		`- throw std::runtime_error( "invalid JSON Schema: keys in object \"patternProperties\" must be regular expressions: " + std::string( e.what() ) );`
	`730`	`+ catch( const std::regex_error& ex ) {`
	`731`	`+ throw std::runtime_error( "invalid JSON Schema: keys in object \"patternProperties\" must be regular expressions: " + std::string( ex.what() ) );`
`732`	`732`	`}`
`733`	`733`	`m_referenced_pointers.insert( e.second.skip_raw_ptr() );`
`734`	`734`	`}`