Disabling thread local locale on Android, tracked with CodePlex 269.

stgates · stgates · commit 433a0744c19b · 2014-09-05T10:56:42.000-07:00
diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h
@@ -49,8 +49,10 @@ namespace pplx = Concurrency;
 
 #ifndef _MS_WINDOWS
 #include <boost/algorithm/string.hpp>
+#ifndef ANDROID // CodePlex 269
 #include <xlocale.h>
 #endif
+#endif
 
 /// Various utilities for string conversions and date and time manipulation.
 namespace utility
@@ -170,18 +172,20 @@ namespace details
         _ASYNCRTIMP scoped_c_thread_locale();
         _ASYNCRTIMP ~scoped_c_thread_locale();
 
+#ifndef ANDROID // CodePlex 269
 #ifdef _MS_WINDOWS
         typedef _locale_t xplat_locale;
 #else
         typedef locale_t xplat_locale;
 #endif
 
         static _ASYNCRTIMP xplat_locale __cdecl c_locale();
+#endif
     private:
 #ifdef _MS_WINDOWS
         std::string m_prevLocale;
         int m_prevThreadSetting;
-#else
+#elif !defined(ANDROID)
         locale_t m_prevLocale;        
 #endif
         scoped_c_thread_locale(const scoped_c_thread_locale &);
diff --git a/Release/src/json/json_serialization.cpp b/Release/src/json/json_serialization.cpp
@@ -164,9 +164,25 @@ void web::json::details::_Number::format(std::basic_string<char>& stream) const
 #else
         int numChars;
         if (m_number.m_type == number::type::signed_type)
-            numChars = snprintf(tempBuffer, tempSize, "%" PRId64, m_number.m_intval);
+            numChars = snprintf(
+                tempBuffer, 
+                tempSize,
+#ifdef ANDROID // CodePlex 269
+                "%lld",
+#else
+                "%" PRId64,
+#endif
+                m_number.m_intval);
         else
-            numChars = snprintf(tempBuffer, tempSize, "%" PRIu64, m_number.m_uintval);
+            numChars = snprintf(
+                tempBuffer, 
+                tempSize,
+#ifdef ANDROID
+                "%llu",
+#else
+                "%" PRIu64,
+#endif
+                m_number.m_uintval);
 #endif
         stream.append(tempBuffer, numChars);
     }
diff --git a/Release/src/utilities/asyncrt_utils.cpp b/Release/src/utilities/asyncrt_utils.cpp
@@ -55,6 +55,7 @@ namespace utility
 namespace details
 {
 
+#ifndef ANDROID
 std::once_flag g_c_localeFlag;
 std::unique_ptr<scoped_c_thread_locale::xplat_locale, void(*)(scoped_c_thread_locale::xplat_locale *)> g_c_locale(nullptr, [](scoped_c_thread_locale::xplat_locale *){});
 scoped_c_thread_locale::xplat_locale scoped_c_thread_locale::c_locale()
@@ -87,6 +88,7 @@ scoped_c_thread_locale::xplat_locale scoped_c_thread_locale::c_locale()
     });
     return *g_c_locale;
 }
+#endif
 
 #ifdef _MS_WINDOWS
 scoped_c_thread_locale::scoped_c_thread_locale()
@@ -122,6 +124,9 @@ scoped_c_thread_locale::~scoped_c_thread_locale()
         _configthreadlocale(m_prevThreadSetting);
     }
 }
+#elif defined(ANDROID)
+scoped_c_thread_locale::scoped_c_thread_locale() {}
+scoped_c_thread_locale::~scoped_c_thread_locale() {}
 #else
 scoped_c_thread_locale::scoped_c_thread_locale()
     : m_prevLocale(nullptr)

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ namespace utility`
`55`	`55`	`namespace details`
`56`	`56`	`{`
`57`	`57`
	`58`	`+#ifndef ANDROID`
`58`	`59`	`std::once_flag g_c_localeFlag;`
`59`	`60`	`std::unique_ptr<scoped_c_thread_locale::xplat_locale, void()(scoped_c_thread_locale::xplat_locale )> g_c_locale(nullptr, [](scoped_c_thread_locale::xplat_locale *){});`
`60`	`61`	`scoped_c_thread_locale::xplat_locale scoped_c_thread_locale::c_locale()`
`@@ -87,6 +88,7 @@ scoped_c_thread_locale::xplat_locale scoped_c_thread_locale::c_locale()`
`87`	`88`	`});`
`88`	`89`	`return *g_c_locale;`
`89`	`90`	`}`
	`91`	`+#endif`
`90`	`92`
`91`	`93`	`#ifdef _MS_WINDOWS`
`92`	`94`	`scoped_c_thread_locale::scoped_c_thread_locale()`
`@@ -122,6 +124,9 @@ scoped_c_thread_locale::~scoped_c_thread_locale()`
`122`	`124`	`_configthreadlocale(m_prevThreadSetting);`
`123`	`125`	`}`
`124`	`126`	`}`
	`127`	`+#elif defined(ANDROID)`
	`128`	`+scoped_c_thread_locale::scoped_c_thread_locale() {}`
	`129`	`+scoped_c_thread_locale::~scoped_c_thread_locale() {}`
`125`	`130`	`#else`
`126`	`131`	`scoped_c_thread_locale::scoped_c_thread_locale()`
`127`	`132`	`: m_prevLocale(nullptr)`