Fixing issues with proposed TFS sync

Author: ras0219-msft

Release/include/compat/SafeInt3.hpp

@@ -56,7 +56,7 @@ Version 3.0
 #ifndef SAFEINT_HPP
 #define SAFEINT_HPP
 
-// Enable compiling with /Wall under VC 
+// Enable compiling with /Wall under VC
 #if !defined __GNUC__
 #pragma warning( push )
 // Disable warnings coming from headers
@@ -78,15 +78,10 @@ Version 3.0
 #pragma warning( pop )
 #endif
 
-// Various things needed for GCC
+// Various things needed for GCC & clang
+// Note: Clang is clever and claims to be GCC by defining __GNUC__
 #if defined __GNUC__
 
-#if !defined __clang__
-
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-
-#endif
-
 #define NEEDS_INT_DEFINED
 
 #if !defined NULL
@@ -97,7 +92,13 @@ Version 3.0
 
 #endif
 
-// If the user made a choice, respect it #if !defined 
+// This is only for GCC, not Clang.
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif
+
+
+// If the user made a choice, respect it #if !defined
 #if !defined NEEDS_NULLPTR_DEFINED
 // Visual Studio 2010 and higher support this
 #if defined(_MSC_VER)

Release/src/json/json.cpp

@@ -313,24 +313,10 @@ bool web::json::number::is_int64() const
     }
 }
 
-struct has_escape_chars_impl {
-  static const char* escapes8;
-  static const wchar_t* escapes16;
-
-  static bool impl(const std::string& s) {
-    return s.find_first_of(escapes8) != std::string::npos;
-  }
-  static bool impl(const std::wstring& s) {
-    return s.find_first_of(escapes16) != std::wstring::npos;
-  }
-};
-
-const char* has_escape_chars_impl::escapes8 = "\"\\\b\f\r\n\t";
-const wchar_t* has_escape_chars_impl::escapes16 = L"\"\\\b\f\r\n\t";
-
 bool web::json::details::_String::has_escape_chars(const _String &str)
 {
-    return has_escape_chars_impl::impl(str.m_string);
+    static const auto escapes = U("\"\\\b\f\r\n\t");
+    return str.m_string.find_first_of(escapes) != utility::string_t::npos;
 }
 
 web::json::details::_Object::_Object(const _Object& other):web::json::details::_Value(other)

Release/src/json/json_serialization.cpp

@@ -132,10 +132,10 @@ void web::json::details::_Number::format(std::basic_string<char>& stream) const
 {
     if(m_number.m_type != number::type::double_type)
     {
+#ifdef _MS_WINDOWS
         // #digits + 1 to avoid loss + 1 for the sign + 1 for null terminator.
         const size_t tempSize = std::numeric_limits<uint64_t>::digits10 + 3;
         char tempBuffer[tempSize];
-#ifdef _MS_WINDOWS
 
         // This can be improved performance-wise if we implement our own routine
         if (m_number.m_type == number::type::signed_type)
@@ -144,19 +144,16 @@ void web::json::details::_Number::format(std::basic_string<char>& stream) const
             _ui64toa_s(m_number.m_uintval, tempBuffer, tempSize, 10);
 
         const auto numChars = strnlen_s(tempBuffer, tempSize);
+        stream.append(tempBuffer, numChars);
 #else
         std::stringstream ss;
         if (m_number.m_type == number::type::signed_type)
             ss << m_number.m_intval;
         else
             ss << m_number.m_uintval;
 
-        std::string s = ss.str();
-        strncpy(tempBuffer, s.c_str(), tempSize - 1);
-        tempBuffer[tempSize - 1] = '\0';
-        const auto numChars = strlen(tempBuffer);
+        stream.append(ss.str());
 #endif
-        stream.append(tempBuffer, numChars);
     }
     else
     {
@@ -225,4 +222,4 @@ utility::string_t web::json::details::_String::as_string() const
 utility::string_t web::json::value::as_string() const
 {
     return m_value->as_string();
-}
+}

Release/tests/Common/UnitTestpp/src/TestList.cpp

@@ -100,16 +100,16 @@ ListAdder::ListAdder(TestList& list, Test* test, ...)
     test->m_properties.Add("Requires", "desktop");
 #endif
 #endif
-	
+
     list.Add(test);
 }
 
-    UNITTEST_LINKAGE TestList GLOBAL_TESTLIST;
+UNITTEST_LINKAGE TestList GLOBAL_TESTLIST;
 
-    extern "C"
-    UNITTEST_LINKAGE TestList& GetTestList()
-    {
-        return GLOBAL_TESTLIST;
-    }
+extern "C"
+UNITTEST_LINKAGE TestList& GetTestList()
+{
+    return GLOBAL_TESTLIST;
+}
 
 }