Merge pull request #4 from SvenJo/compiler_warnings

Compiler warnings

Author: d-frey

include/tao/json/internal/action.hh

@@ -138,8 +138,8 @@ namespace tao
                }
                const auto c = std::min( in.size(), max_mantissa_digits );
                std::memcpy( result.mantissa, in.begin(), c );
-               result.exponent10 += in.size() - c;
-               result.msize = c;
+               result.exponent10 += static_cast<number_state::exponent10_t>(in.size() - c);
+               result.msize = static_cast<number_state::msize_t>(c);
 
                for ( std::size_t i = c; i < in.size(); ++i ) {
                   if ( in.peek_char( i ) != '0' ) {
@@ -171,8 +171,8 @@ namespace tao
                }
                const auto c = std::min( std::size_t( e - b ), max_mantissa_digits - result.msize );
                std::memcpy( result.mantissa + result.msize, b, c );
-               result.exponent10 -= c;
-               result.msize += c;
+               result.exponent10 -= static_cast<number_state::exponent10_t>(c);
+               result.msize += static_cast<number_state::msize_t>(c);
 
                for ( const auto * r = b + c; r < e; ++r ) {
                   if ( *r != '0' ) {

include/tao/json/internal/number_state.hh

@@ -20,13 +20,16 @@ namespace tao
 
          struct number_state
          {
+            using exponent10_t = int32_t;
+            using msize_t = uint16_t;
+
             number_state() {}
 
             number_state( const number_state & ) = delete;
             void operator= ( const number_state & ) = delete;
 
-            int32_t exponent10 = 0;
-            uint16_t msize = 0;  // Excluding sign.
+            exponent10_t exponent10 = 0;
+            msize_t msize = 0;  // Excluding sign.
             bool isfp = false;
             bool mneg = false;
             bool eneg = false;

include/tao/json/pointer.hh

@@ -9,6 +9,7 @@
 #include <utility>
 #include <stdexcept>
 #include <vector>
+#include <limits>
 
 #include "external/operators.hpp"
 
@@ -30,7 +31,7 @@ namespace tao
          std::string m_key;
 
       public:
-         static const std::size_t npos = -1;
+         static const std::size_t npos = std::numeric_limits<size_t>::max();
 
          explicit token( const std::string & key )
               : m_index( internal::token_to_index( key ) ),