Fixed merge issues for linux

Author: ras0219-msft

Release/include/cpprest/json.h

@@ -1389,8 +1389,6 @@ namespace web { namespace json
                 }
                 return reserveSize;
             }
-            
-            template<typename CharType> friend class web::json::details::JSON_Parser;
         };
     } // namespace details
 

Release/src/json/json.cpp

@@ -313,20 +313,24 @@ 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)
 {
-    struct escapes {
-        static const char* escapes8 = "\"\\\b\f\r\n\t";
-        static const wchar_t* escapes16 = L"\"\\\b\f\r\n\t";
-
-        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;
-        }
-    };
-    return escapes::impl(str.m_string);
+    return has_escape_chars_impl::impl(str.m_string);
 }
 
 web::json::details::_Object::_Object(const _Object& other):web::json::details::_Value(other)
@@ -489,4 +493,4 @@ const web::json::value& web::json::value::operator[](size_t index) const
 #endif
     }
     return m_value->cnst_index(index);
-}
+}

Release/tests/Functional/json/to_as_and_operators_tests.cpp

@@ -321,12 +321,14 @@ TEST(floating_number_serialize)
     value.serialize(ss);
     VERIFY_ARE_EQUAL(len, ss.str().length());
 
+#ifdef _MS_WINDOWS
     // Check wide string implementation
     std::basic_stringstream<wchar_t> wss;
     value.serialize(wss);
     VERIFY_ARE_EQUAL(len, wss.str().length());
+#endif
 }
 
 } // SUITE(to_as_and_operators_tests)
 
-}}}
+}}}