Added noexcept to VS 14, changed char16_t overloads on MSVC to use wchar_t instead

Author: ras0219-msft

Release/include/cpprest/details/windows_compat.h

@@ -26,14 +26,18 @@
 ****/
 #pragma once
 
-#if _MSC_VER >= 1700
+#if defined(_MSC_VER) && _MSC_VER >= 1700
 // Support VS2012 SAL syntax only
 #include <sal.h>
 #else
 #include "cpprest/details/nosal.h"
 #endif
 
-#define _noexcept 
+#if defined(_MSC_VER) && _MSC_VER >= 1800
+#define _noexcept noexcept
+#else
+#define _noexcept
+#endif
 
 #define CASABLANCA_UNREFERENCED_PARAMETER(x) (x)
 

Release/src/json/json_parsing.cpp

@@ -697,11 +697,11 @@ bool JSON_StringParser<CharType>::CompleteComment(typename JSON_Parser<CharType>
     return true;
 }
 
-void convert_append_unicode_code_unit(JSON_Parser<wchar_t>::Token &token, char16_t value)
+void convert_append_unicode_code_unit(JSON_Parser<wchar_t>::Token &token, utf16char value)
 {
     token.string_val.push_back(value);
 }
-void convert_append_unicode_code_unit(JSON_Parser<char>::Token &token, char16_t value)
+void convert_append_unicode_code_unit(JSON_Parser<char>::Token &token, utf16char value)
 {
     utf16string utf16(reinterpret_cast<utf16char *>(&value), 1);
     token.string_val.append(::utility::conversions::utf16_to_utf8(utf16));
@@ -766,7 +766,7 @@ inline bool JSON_Parser<CharType>::handle_unescape_char(Token &token)
             }
 
             // Construct the character based on the decoded number
-            convert_append_unicode_code_unit(token, static_cast<char16_t>(decoded));
+			convert_append_unicode_code_unit(token, static_cast<utf16char>(decoded));
 
             return true;
         }