diff

Go Back — Change Paste Viewing Options

Index: json_spirit_writer_template.h
===================================================================
--- json_spirit_writer_template.h	(wersja 981)
+++ json_spirit_writer_template.h	(kopia robocza)
@@ -32,9 +32,9 @@
 

         const char ch = static_cast< char >( c );

 

-        if( ch < 10 ) return '0' + ch;

+        if( ch < 10 ) return static_cast<char>('0' + ch);

 

-        return 'A' - 10 + ch;

+        return static_cast<char>('A' - 10 + ch);

     }

 

     template< class String_type >

@@ -66,6 +66,7 @@
             case '\n': s += to_str< String_type >( "\\n"  ); return true;

             case '\r': s += to_str< String_type >( "\\r"  ); return true;

             case '\t': s += to_str< String_type >( "\\t"  ); return true;

+            default: break;

         }

 

         return false;

Index: json_spirit_value.h
===================================================================
--- json_spirit_value.h	(wersja 981)
+++ json_spirit_value.h	(kopia robocza)
@@ -331,7 +331,7 @@
         {

             std::ostringstream os;

 

-            os << "value type is " << type() << " not " << vtype;

+            os << "value type is " << static_cast<int>(type()) << " not " << static_cast<int>(vtype);

 

             throw std::runtime_error( os.str() );

         }

Index: json_spirit_reader_template.h
===================================================================
--- json_spirit_reader_template.h	(wersja 981)
+++ json_spirit_reader_template.h	(kopia robocza)
@@ -52,9 +52,9 @@
     template< class Char_type >

     Char_type hex_to_num( const Char_type c )

     {

-        if( ( c >= '0' ) && ( c <= '9' ) ) return c - '0';

-        if( ( c >= 'a' ) && ( c <= 'f' ) ) return c - 'a' + 10;

-        if( ( c >= 'A' ) && ( c <= 'F' ) ) return c - 'A' + 10;

+        if( ( c >= '0' ) && ( c <= '9' ) ) return static_cast<Char_type>(c - '0');

+        if( ( c >= 'a' ) && ( c <= 'f' ) ) return static_cast<Char_type>(c - 'a' + 10);

+        if( ( c >= 'A' ) && ( c <= 'F' ) ) return static_cast<Char_type>(c - 'A' + 10);

         return 0;

     }

 

@@ -64,7 +64,7 @@
         const Char_type c1( *( ++begin ) );

         const Char_type c2( *( ++begin ) );

 

-        return ( hex_to_num( c1 ) << 4 ) + hex_to_num( c2 );

+        return static_cast<Char_type>(( hex_to_num( c1 ) << 4 ) + hex_to_num( c2 ));

     }       

 

     template< class Char_type, class Iter_type >

@@ -75,10 +75,10 @@
         const Char_type c3( *( ++begin ) );

         const Char_type c4( *( ++begin ) );

 

-        return ( hex_to_num( c1 ) << 12 ) + 

+        return static_cast<Char_type>(( hex_to_num( c1 ) << 12 ) + 

                ( hex_to_num( c2 ) <<  8 ) + 

                ( hex_to_num( c3 ) <<  4 ) + 

-               hex_to_num( c4 );

+               hex_to_num( c4 ));

     }

 

     template< class String_type >

@@ -116,6 +116,7 @@
                 }

                 break;

             }

+            default: break;

         }

     }

 

@@ -359,7 +360,7 @@
     }

 

     template< typename Iter_type >

-    void throw_error( Iter_type i, const std::string& reason )

+    void throw_error( Iter_type /*i*/, const std::string& reason )

     {

        throw reason;

     }

@@ -378,32 +379,32 @@
         {

         }

 

-        static void throw_not_value( Iter_type begin, Iter_type end )

+        static void throw_not_value( Iter_type begin, Iter_type /*end*/ )

         {

     	    throw_error( begin, "not a value" );

         }

 

-        static void throw_not_array( Iter_type begin, Iter_type end )

+        static void throw_not_array( Iter_type begin, Iter_type /*end*/ )

         {

     	    throw_error( begin, "not an array" );

         }

 

-        static void throw_not_object( Iter_type begin, Iter_type end )

+        static void throw_not_object( Iter_type begin, Iter_type /*end*/ )

         {

     	    throw_error( begin, "not an object" );

         }

 

-        static void throw_not_pair( Iter_type begin, Iter_type end )

+        static void throw_not_pair( Iter_type begin, Iter_type /*end*/ )

         {

     	    throw_error( begin, "not a pair" );

         }

 

-        static void throw_not_colon( Iter_type begin, Iter_type end )

+        static void throw_not_colon( Iter_type begin, Iter_type /*end*/ )

         {

     	    throw_error( begin, "no colon in pair" );

         }

 

-        static void throw_not_string( Iter_type begin, Iter_type end )

+        static void throw_not_string( Iter_type begin, Iter_type /*end*/ )

         {

     	    throw_error( begin, "not a string" );

         }			

Go Back