Resolve some warnings from MSVC

d-frey · d-frey · commit dde11aa4d81d · 2017-12-18T18:04:59.000+01:00
diff --git a/include/tao/json/events/ubjson/to_stream.hpp b/include/tao/json/events/ubjson/to_stream.hpp
@@ -44,15 +44,15 @@ namespace tao
                {
                   if( ( v >= -128 ) && ( v <= 127 ) ) {
                      os.put( 'i' );
-                     const std::int8_t x = v;
+                     const std::int8_t x = static_cast< std::int8_t >( v );
                      os.write( reinterpret_cast< const char* >( &x ), sizeof( x ) );
                   }
                   else if( ( v >= -32768 ) && ( v <= 32767 ) ) {
                      os.put( 'I' );
                      const std::uint16_t x = internal::h_to_be( std::uint16_t( v ) );
                      os.write( reinterpret_cast< const char* >( &x ), sizeof( x ) );
                   }
-                  else if( ( v >= -2147483648 ) && ( v <= 2147483647 ) ) {
+                  else if( ( v >= -2147483648ll ) && ( v <= 2147483647ll ) ) {
                      os.put( 'l' );
                      const std::uint32_t x = internal::h_to_be( std::uint32_t( v ) );
                      os.write( reinterpret_cast< const char* >( &x ), sizeof( x ) );
@@ -68,7 +68,7 @@ namespace tao
                {
                   if( v <= 255 ) {
                      os.put( 'U' );
-                     const std::uint8_t x = v;
+                     const std::uint8_t x = static_cast< std::uint8_t >( v );
                      os.write( reinterpret_cast< const char* >( &x ), sizeof( x ) );
                   }
                   else if( v <= 32767 ) {

Original file line number	Diff line number	Diff line change
`@@ -44,15 +44,15 @@ namespace tao`
`44`	`44`	`{`
`45`	`45`	`if( ( v >= -128 ) && ( v <= 127 ) ) {`
`46`	`46`	`os.put( 'i' );`
`47`		`- const std::int8_t x = v;`
	`47`	`+ const std::int8_t x = static_cast< std::int8_t >( v );`
`48`	`48`	`os.write( reinterpret_cast< const char* >( &x ), sizeof( x ) );`
`49`	`49`	`}`
`50`	`50`	`else if( ( v >= -32768 ) && ( v <= 32767 ) ) {`
`51`	`51`	`os.put( 'I' );`
`52`	`52`	`const std::uint16_t x = internal::h_to_be( std::uint16_t( v ) );`
`53`	`53`	`os.write( reinterpret_cast< const char* >( &x ), sizeof( x ) );`
`54`	`54`	`}`
`55`		`- else if( ( v >= -2147483648 ) && ( v <= 2147483647 ) ) {`
	`55`	`+ else if( ( v >= -2147483648ll ) && ( v <= 2147483647ll ) ) {`
`56`	`56`	`os.put( 'l' );`
`57`	`57`	`const std::uint32_t x = internal::h_to_be( std::uint32_t( v ) );`
`58`	`58`	`os.write( reinterpret_cast< const char* >( &x ), sizeof( x ) );`
`@@ -68,7 +68,7 @@ namespace tao`
`68`	`68`	`{`
`69`	`69`	`if( v <= 255 ) {`
`70`	`70`	`os.put( 'U' );`
`71`		`- const std::uint8_t x = v;`
	`71`	`+ const std::uint8_t x = static_cast< std::uint8_t >( v );`
`72`	`72`	`os.write( reinterpret_cast< const char* >( &x ), sizeof( x ) );`
`73`	`73`	`}`
`74`	`74`	`else if( v <= 32767 ) {`