Merge pull request #612 from garethsb-sony/force_http_listener_asio

Define http_listener if CPPREST_FORCE_HTTP_LISTENER_ASIO is defined (part 2)

Author: ras0219-msft

Release/src/http/listener/http_listener.cpp

@@ -13,7 +13,7 @@
 
 #include "stdafx.h"
 
-#if !defined(_WIN32) || (_WIN32_WINNT >= _WIN32_WINNT_VISTA && !defined(__cplusplus_winrt))
+#if !defined(_WIN32) || (_WIN32_WINNT >= _WIN32_WINNT_VISTA && !defined(__cplusplus_winrt)) || defined(CPPREST_FORCE_HTTP_LISTENER_ASIO)
 
 using namespace web::http::experimental;
 

Release/src/http/listener/http_server_api.cpp

@@ -11,7 +11,7 @@
 
 #include "stdafx.h"
 
-#if !defined(_WIN32) || (_WIN32_WINNT >= _WIN32_WINNT_VISTA && !defined(__cplusplus_winrt))
+#if !defined(_WIN32) || (_WIN32_WINNT >= _WIN32_WINNT_VISTA && !defined(__cplusplus_winrt)) || defined(CPPREST_FORCE_HTTP_LISTENER_ASIO)
 #include "http_server_impl.h"
 
 using namespace web;

Release/tests/functional/http/listener/listener_construction_tests.cpp

@@ -430,7 +430,7 @@ TEST_FIXTURE(uri_address, listener_config_creation)
     }
 }
 
-#if !defined(_WIN32) && !defined(__cplusplus_winrt)
+#if !defined(_WIN32) && !defined(__cplusplus_winrt) || defined(CPPREST_FORCE_HTTP_LISTENER_ASIO)
 
 TEST_FIXTURE(uri_address, create_https_listener_get, "Ignore", "github 209")
 {
@@ -545,7 +545,6 @@ XzJTD4slrGSJrcpLt/g/Jqqdjg==
 
             for (auto&& h : all_headers)
             {
-                std::cout << "HEADER - " << h.first << ": " << h.second << std::endl;
                 VERIFY_IS_TRUE(request.headers().has(h.first));
                 VERIFY_ARE_EQUAL(h.second, request.headers().find(h.first)->second);
             }

Release/tests/functional/websockets/utilities/test_websocket_server.cpp

@@ -18,8 +18,9 @@
 #include "test_websocket_server.h"
 
 #ifdef _WIN32
+#pragma warning(disable : 4503) // generated too late for disable to be effective inside push/pop
 #pragma warning( push )
-#pragma warning(disable : 4100 4127 4996 4512 4701 4267 4067 4503 4005)
+#pragma warning(disable : 4100 4127 4996 4512 4701 4267 4067 4005)
 #define _WEBSOCKETPP_CPP11_STL_
 #define _WEBSOCKETPP_CONSTEXPR_TOKEN_
 #if _MSC_VER < 1900