Merge branch 'remove_sync' into stream_missing_data

Author: stgates

Release/include/compat/apple_compat.h

@@ -24,7 +24,6 @@
 #pragma once
 
 #include <cstdint>
-#include <string>
 #include <sstream>
 #include <iostream>
 #define __cdecl
@@ -53,13 +52,3 @@
 #else
 #define CASABLANCA_DEPRECATED(x) __attribute__((deprecated(x)))
 #endif
-
-#include <string>
-
-typedef char16_t utf16char;
-typedef std::u16string utf16string;
-typedef std::basic_stringstream<char16_t> utf16stringstream;
-typedef std::basic_ostringstream<char16_t> utf16ostringstream;
-typedef std::basic_ostream<char16_t> utf16ostream;
-typedef std::basic_istream<char16_t> utf16istream;
-typedef std::basic_istringstream<char16_t> utf16istringstream;

Release/include/compat/linux_compat.h

@@ -22,7 +22,6 @@
 
 #pragma once
 #include <cstdint>
-#include <string>
 #include <sstream>
 #include <iostream>
 #define __cdecl __attribute__ ((cdecl))
@@ -55,13 +54,3 @@
 #define CASABLANCA_DEPRECATED(x) __attribute__((deprecated(x)))
 #endif
 
-#include <string>
-
-typedef char16_t utf16char;
-typedef std::u16string utf16string;
-typedef std::basic_stringstream<char16_t> utf16stringstream;
-typedef std::basic_ostringstream<char16_t> utf16ostringstream;
-typedef std::basic_ostream<char16_t> utf16ostream;
-typedef std::basic_istream<char16_t> utf16istream;
-typedef std::basic_istringstream<char16_t> utf16istringstream;
-

Release/include/compat/windows_compat.h

@@ -26,8 +26,6 @@
 ****/
 #pragma once
 
-#include <string>
-
 #if _MSC_VER >= 1700
 // Support VS2012 SAL syntax only
 #include <sal.h>
@@ -43,12 +41,4 @@
 #define CASABLANCA_DEPRECATED(x)
 #else
 #define CASABLANCA_DEPRECATED(x) __declspec(deprecated(x))
-#endif
-
-typedef wchar_t utf16char;
-typedef std::wstring utf16string;
-typedef std::wstringstream utf16stringstream;
-typedef std::wostringstream utf16ostringstream;
-typedef std::wostream utf16ostream;
-typedef std::wistream utf16istream;
-typedef std::wistringstream utf16istringstream;
+#endif

Release/include/cpprest/basic_types.h

@@ -99,3 +99,29 @@ typedef std::stringstream stringstream_t;
 #endif // !_TURN_OFF_PLATFORM_STRING
 
 }// namespace utility
+
+typedef char utf8char;
+typedef std::string utf8string;
+typedef std::stringstream utf8stringstream;
+typedef std::ostringstream utf8ostringstream;
+typedef std::ostream utf8ostream;
+typedef std::istream utf8istream;
+typedef std::istringstream utf8istringstream;
+
+#ifdef _UTF16_STRINGS
+typedef wchar_t utf16char;
+typedef std::wstring utf16string;
+typedef std::wstringstream utf16stringstream;
+typedef std::wostringstream utf16ostringstream;
+typedef std::wostream utf16ostream;
+typedef std::wistream utf16istream;
+typedef std::wistringstream utf16istringstream;
+#else
+typedef char16_t utf16char;
+typedef std::u16string utf16string;
+typedef std::basic_stringstream<utf16char> utf16stringstream;
+typedef std::basic_ostringstream<utf16char> utf16ostringstream;
+typedef std::basic_ostream<utf16char> utf16ostream;
+typedef std::basic_istream<utf16char> utf16istream;
+typedef std::basic_istringstream<utf16char> utf16istringstream;
+#endif