Merge remote-tracking branch 'origin/safeintfix' into vs14rc_update

Author: stgates

CONTRIBUTORS.txt

@@ -18,6 +18,7 @@ halex2005
 simonlep
 jracle
 gandziej 
+adish
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)

Release/include/cpprest/details/SafeInt3.hpp

@@ -51,8 +51,7 @@ This header compiles properly at Wall on Visual Studio, -Wall on gcc, and -Wever
 
 Please read the leading comments before using the class.
 ---------------------------------------------------------------*/
-#ifndef SAFEINT_HPP
-#define SAFEINT_HPP
+#pragma once
 
 // It is a bit tricky to sort out what compiler we are actually using,
 // do this once here, and avoid cluttering the code
@@ -7042,7 +7041,6 @@ SafeInt< T, E > operator |( U lhs, SafeInt< T, E > rhs ) SAFEINT_NOTHROW
 #if SAFEINT_COMPILER == CLANG_COMPILER
 #pragma clang diagnostic pop
 #endif
-#endif //SAFEINT_HPP
 
 } // utilities
 } // safeint3

Release/src/http/oauth/oauth2.cpp

@@ -187,7 +187,20 @@ oauth2_token oauth2_config::_parse_token_from_json(const json::value& token_json
 
     if (token_json.has_field(oauth2_strings::expires_in))
     {
-        result.set_expires_in(token_json.at(oauth2_strings::expires_in).as_number().to_int64());
+        const auto &json_expires_in_val = token_json.at(oauth2_strings::expires_in);
+
+        if (json_expires_in_val.is_number())
+           result.set_expires_in(json_expires_in_val.as_number().to_int64());
+        else 
+        {
+            // Handle the case of a number as a JSON "string".
+            // Using streams because std::stoll isn't avaliable on Android.
+            int64_t expires;
+            utility::istringstream_t iss(json_expires_in_val.as_string());
+            iss.exceptions(std::ios::badbit | std::ios::failbit);
+            iss >> expires;
+            result.set_expires_in(expires);
+        }
     }
     else
     {