Merge branch 'development' of https://git01.codeplex.com/forks/simonlep/cpprest into safeintpullrequest

Conflicts:
	Release/include/cpprest/details/SafeInt3.hpp

Author: stgates

Release/include/cpprest/details/SafeInt3.hpp

@@ -136,8 +136,8 @@ Please read the leading comments before using the class.
         #define NEEDS_NULLPTR_DEFINED 0
         #endif
     #else
-    // Let everything else trigger based on whether we have nullptr_t
-    #if defined nullptr_t
+    // Let everything else trigger based on whether we use c++11 or above
+    #if __cplusplus >= 201103L
         #define NEEDS_NULLPTR_DEFINED 0
         #else
         #define NEEDS_NULLPTR_DEFINED 1

Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp

@@ -442,8 +442,8 @@ class connection : public config::socket_type::socket_con_type {
         if (ec) {
             // reset the handlers to break the circular reference:
             // this->handler->this
-            m_async_read_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
-            m_async_write_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
+            m_async_read_handler = async_read_handler{};
+            m_async_write_handler = async_write_handler{};
         }
 
         return ec;
@@ -969,12 +969,12 @@ class connection : public config::socket_type::socket_con_type {
 		// Reset cached handlers now that we won't be reading or writing anymore
 		// These cached handlers store shared pointers to this connection and
 		// will leak the connection if not destroyed.
-		m_async_read_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
-		m_async_write_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
-		m_init_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
+		m_async_read_handler = async_read_handler{};
+		m_async_write_handler = async_write_handler{};
+		m_init_handler = init_handler{};
 
-        m_read_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
-        m_write_handler = _WEBSOCKETPP_NULLPTR_TOKEN_;
+        m_read_handler = read_handler{};
+        m_write_handler = write_handler{};
 
         timer_ptr shutdown_timer;
         shutdown_timer = set_timer(