Merge branch 'development' of https://git01.codeplex.com/casablanca into websocket_tls_windows

Author: stgates

Release/include/cpprest/asyncrt_utils.h

@@ -250,11 +250,11 @@ namespace details
 class windows_category_impl : public std::error_category
 {
 public:
-    virtual const char *name() const _noexcept { return "windows"; }
+    virtual const char *name() const CPPREST_NOEXCEPT { return "windows"; }
 
-    _ASYNCRTIMP virtual std::string message(int errorCode) const _noexcept;
+    _ASYNCRTIMP virtual std::string message(int errorCode) const CPPREST_NOEXCEPT;
 
-    _ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const _noexcept;
+    _ASYNCRTIMP virtual std::error_condition default_error_condition(int errorCode) const CPPREST_NOEXCEPT;
 };
 
 /// <summary>

Release/include/cpprest/base_uri.h

@@ -70,7 +70,7 @@ namespace web {
                 return *this;
             }
 
-            uri_components(uri_components &&other) _noexcept :
+            uri_components(uri_components &&other) CPPREST_NOEXCEPT :
                 m_scheme(std::move(other.m_scheme)),
                 m_host(std::move(other.m_host)),
                 m_user_info(std::move(other.m_user_info)),
@@ -80,7 +80,7 @@ namespace web {
                 m_port(other.m_port)
             {}
 
-            uri_components & operator=(uri_components &&other) _noexcept
+            uri_components & operator=(uri_components &&other) CPPREST_NOEXCEPT
             {
                 if (this != &other)
                 {
@@ -116,9 +116,9 @@ namespace web {
 
         uri_exception(std::string msg) : m_msg(std::move(msg)) {}
 
-        ~uri_exception() _noexcept {}
+        ~uri_exception() CPPREST_NOEXCEPT {}
 
-        const char* what() const _noexcept
+        const char* what() const CPPREST_NOEXCEPT
         {
             return m_msg.c_str();
         }
@@ -264,15 +264,15 @@ namespace web {
         /// <summary>
         /// Move constructor.
         /// </summary>
-        uri(uri &&other) _noexcept :
+        uri(uri &&other) CPPREST_NOEXCEPT :
             m_uri(std::move(other.m_uri)),
             m_components(std::move(other.m_components))
         {}
 
         /// <summary>
         /// Move assignment operator
         /// </summary>
-        uri & operator=(uri &&other) _noexcept
+        uri & operator=(uri &&other) CPPREST_NOEXCEPT
         {
             if (this != &other)
             {

Release/include/cpprest/details/apple_compat.h

@@ -30,8 +30,7 @@
 
 #include "nosal.h"
 
-// MSVC doesn't support this yet
-#define _noexcept noexcept
+#define CPPREST_NOEXCEPT noexcept
 
 #define novtable /* no novtable equivalent */
 #define __declspec(x) __attribute__ ((x))

Release/include/cpprest/details/linux_compat.h

@@ -28,8 +28,7 @@
 
 #include "cpprest/details/nosal.h"
 
-// MSVC doesn't support this yet
-#define _noexcept noexcept
+#define CPPREST_NOEXCEPT noexcept
 
 #define novtable /* no novtable equivalent */
 #define __declspec(x) __attribute__ ((x))

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 >= 1900
+#define CPPREST_NOEXCEPT noexcept
+#else
+#define CPPREST_NOEXCEPT
+#endif
 
 #define CASABLANCA_UNREFERENCED_PARAMETER(x) (x)
 

Release/include/cpprest/http_client.h

@@ -369,7 +369,7 @@ class http_client
     /// Note the destructor doesn't necessarily close the connection and release resources.
     /// The connection is reference counted with the http_responses.
     /// </summary>
-    ~http_client() _noexcept {}
+    ~http_client() CPPREST_NOEXCEPT {}
 
     /// <summary>
     /// Gets the base uri

Release/include/cpprest/http_msg.h

@@ -200,9 +200,9 @@ class http_exception : public std::exception
         m_msg = m_errorCode.message();
     }
 
-    ~http_exception() _noexcept {}
+    ~http_exception() CPPREST_NOEXCEPT {}
 
-    const char* what() const _noexcept
+    const char* what() const CPPREST_NOEXCEPT
     {
         return m_msg.c_str();
     }

Release/include/cpprest/json.h

@@ -209,7 +209,7 @@ namespace json
         /// <summary>
         /// Move constructor
         /// </summary>
-        _ASYNCRTIMP value(value &&) _noexcept ;
+        _ASYNCRTIMP value(value &&) CPPREST_NOEXCEPT ;
 
         /// <summary>
         /// Assignment operator.
@@ -221,7 +221,7 @@ namespace json
         /// Move assignment operator.
         /// </summary>
         /// <returns>The JSON value object that contains the result of the assignment.</returns>
-        _ASYNCRTIMP value &operator=(value &&) _noexcept ;
+        _ASYNCRTIMP value &operator=(value &&) CPPREST_NOEXCEPT ;
 
         // Static factories
 
@@ -627,11 +627,11 @@ namespace json
         json_exception(const utility::char_t * const &message) : _message(utility::conversions::to_utf8string(message)) { }
 
         // Must be narrow string because it derives from std::exception
-        const char* what() const _noexcept
+        const char* what() const CPPREST_NOEXCEPT
         {
             return _message.c_str();
         }
-        ~json_exception() _noexcept {}
+        ~json_exception() CPPREST_NOEXCEPT {}
     };
 
     /// <summary>

Release/include/cpprest/oauth1.h

@@ -117,8 +117,8 @@ class oauth1_exception : public std::exception
 {
 public:
     oauth1_exception(utility::string_t msg) : m_msg(utility::conversions::to_utf8string(std::move(msg))) {}
-    ~oauth1_exception() _noexcept {}
-    const char* what() const _noexcept { return m_msg.c_str(); }
+    ~oauth1_exception() CPPREST_NOEXCEPT {}
+    const char* what() const CPPREST_NOEXCEPT { return m_msg.c_str(); }
 
 private:
     std::string m_msg;

Release/include/cpprest/oauth2.h

@@ -68,8 +68,8 @@ class oauth2_exception : public std::exception
 {
 public:
     oauth2_exception(utility::string_t msg) : m_msg(utility::conversions::to_utf8string(std::move(msg))) {}
-    ~oauth2_exception() _noexcept {}
-    const char* what() const _noexcept { return m_msg.c_str(); }
+    ~oauth2_exception() CPPREST_NOEXCEPT {}
+    const char* what() const CPPREST_NOEXCEPT { return m_msg.c_str(); }
 
 private:
     std::string m_msg;