From 6d6eb19ab8223fc385508cbd220a7a2d28f998ed Mon Sep 17 00:00:00 2001
From: "ambre.tanmay@gmail.com" <ambre.tanmay@gmail.com>
Date: Fri, 25 Sep 2015 09:33:13 +0100
Subject: [PATCH] Silenced remaining VS2015 warnings. Resolved #17.

---
 cmake/build_configuration.cmake                        |  2 +-
 example/compression/source/example.cpp                 |  4 ++--
 example/session_manager/source/example.cpp             | 10 ++++++----
 source/corvusoft/restbed/detail/socket_impl.cpp        |  2 +-
 .../source/custom_authentication/resource.cpp          |  3 ---
 .../source/custom_authentication/service.cpp           |  5 ++---
 .../source/custom_error_handling/resource.cpp          |  5 ++---
 .../source/custom_error_handling/service.cpp           |  4 +---
 .../resource.cpp                                       |  4 +---
 .../service.cpp                                        |  4 +---
 .../source/custom_http_methods/http_connect.cpp        |  4 +---
 .../source/custom_http_methods/http_delete.cpp         |  4 +---
 .../acceptance/source/custom_http_methods/http_get.cpp |  4 +---
 .../source/custom_http_methods/http_head.cpp           |  4 +---
 .../source/custom_http_methods/http_invoke.cpp         |  4 +---
 .../source/custom_http_methods/http_options.cpp        |  4 +---
 .../source/custom_http_methods/http_patch.cpp          |  4 +---
 .../source/custom_http_methods/http_post.cpp           |  4 +---
 .../acceptance/source/custom_http_methods/http_put.cpp |  4 +---
 .../source/custom_http_methods/http_trace.cpp          |  4 +---
 .../custom_method_not_allowed_handler/scenario.cpp     |  4 +---
 .../custom_method_not_implemented_handler/scenario.cpp |  4 +---
 .../custom_resource_not_found_handler/scenario.cpp     |  4 +---
 .../source/http_method_handlers/http_connect.cpp       |  4 +---
 .../source/http_method_handlers/http_delete.cpp        |  4 +---
 .../source/http_method_handlers/http_get.cpp           |  4 +---
 .../source/http_method_handlers/http_head.cpp          |  4 +---
 .../source/http_method_handlers/http_options.cpp       |  4 +---
 .../source/http_method_handlers/http_patch.cpp         |  4 +---
 .../source/http_method_handlers/http_post.cpp          |  4 +---
 .../source/http_method_handlers/http_put.cpp           |  4 +---
 .../source/http_method_handlers/http_trace.cpp         |  4 +---
 test/acceptance/source/path_parameters/scenario.cpp    |  4 +---
 .../source/publish_duplicate_resources/scenario.cpp    |  4 +---
 .../publishing_multi_path_resources/http_connect.cpp   |  4 +---
 .../publishing_multi_path_resources/http_delete.cpp    |  4 +---
 .../publishing_multi_path_resources/http_get.cpp       |  4 +---
 .../publishing_multi_path_resources/http_head.cpp      |  4 +---
 .../publishing_multi_path_resources/http_options.cpp   |  4 +---
 .../publishing_multi_path_resources/http_patch.cpp     |  4 +---
 .../publishing_multi_path_resources/http_post.cpp      |  4 +---
 .../publishing_multi_path_resources/http_put.cpp       |  4 +---
 .../publishing_multi_path_resources/http_trace.cpp     |  4 +---
 .../publishing_single_path_resources/http_connect.cpp  |  4 +---
 .../publishing_single_path_resources/http_delete.cpp   |  4 +---
 .../publishing_single_path_resources/http_get.cpp      |  4 +---
 .../publishing_single_path_resources/http_head.cpp     |  4 +---
 .../publishing_single_path_resources/http_options.cpp  |  4 +---
 .../publishing_single_path_resources/http_patch.cpp    |  4 +---
 .../publishing_single_path_resources/http_post.cpp     |  4 +---
 .../publishing_single_path_resources/http_put.cpp      |  4 +---
 .../publishing_single_path_resources/http_trace.cpp    |  4 +---
 test/acceptance/source/query_parameters/scenario.cpp   |  4 +---
 .../source/resource_method_filters/scenario.cpp        |  4 +---
 test/acceptance/source/rules_engine/mixed.cpp          |  4 +---
 test/acceptance/source/rules_engine/resource.cpp       |  4 +---
 test/acceptance/source/rules_engine/service.cpp        |  4 +---
 .../source/runtime_service_modifications/scenario.cpp  |  4 +---
 .../service_case_sensitivity/case_insensitive.cpp      |  4 +---
 .../source/service_case_sensitivity/case_sensitive.cpp |  4 +---
 test/integration/source/resource_suite.cpp             |  4 +---
 test/integration/source/response_suite.cpp             |  4 +---
 test/integration/source/session_suite.cpp              |  4 +---
 test/integration/source/settings_suite.cpp             |  4 +---
 test/integration/source/ssl_settings_suite.cpp         |  4 +---
 test/integration/source/string_suite.cpp               |  4 +---
 .../content_length_present_on_empty_response_body.cpp  |  4 +---
 .../content_type_present_on_empty_response_body.cpp    |  4 +---
 .../source/error_handler_not_overwritten.cpp           |  4 +---
 .../exception_thrown_with_space_in_resource_path.cpp   |  4 +---
 .../fails_to_parse_header_values_containing_colons.cpp |  4 +---
 .../fails_to_parse_identical_query_parameters.cpp      |  4 +---
 .../source/large_request_bodies_being_trimmed.cpp      |  4 +---
 .../source/missing_regex_support_on_gcc_4.8.cpp        |  4 +---
 .../path_parameters_are_not_visible_within_rules.cpp   |  4 +---
 .../request_get_parameters_fails_to_return_data.cpp    |  4 +---
 .../source/request_uris_are_not_being_decoded.cpp      |  4 +---
 ...e_instance_destroyed_with_bound_method_functors.cpp |  4 +---
 .../source/resource_responding_on_invalid_path.cpp     |  4 +---
 .../source/resources_are_not_overwritten.cpp           |  4 +---
 .../source/segmentation_fault_on_mismatched_path.cpp   |  4 +---
 ...tring_replace_fails_to_replace_embedded_targets.cpp |  4 +---
 .../uncaught_exception_when_peer_closes_connection.cpp |  4 +---
 .../uri_fails_to_handle_file_scheme_relative_paths.cpp |  4 +---
 test/unit/source/request_suite.cpp                     |  8 +++-----
 test/unit/source/resource_suite.cpp                    |  4 +---
 test/unit/source/response_suite.cpp                    |  4 +---
 test/unit/source/service_suite.cpp                     |  4 +---
 test/unit/source/session_suite.cpp                     |  4 +---
 test/unit/source/settings_suite.cpp                    |  4 +---
 test/unit/source/ssl_settings_suite.cpp                |  4 +---
 test/unit/source/string_suite.cpp                      |  4 +---
 test/unit/source/uri_suite.cpp                         |  3 ---
 93 files changed, 101 insertions(+), 277 deletions(-)

diff --git a/cmake/build_configuration.cmake b/cmake/build_configuration.cmake
index c1f84708..580b6c42 100644
--- a/cmake/build_configuration.cmake
+++ b/cmake/build_configuration.cmake
@@ -31,7 +31,7 @@ elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC )
     if ( ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 19.00.23026.0 )
         message( WARNING "\nMSVC compiler version < 19.00.23026.0" )
     endif ( )
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=0x0601 /W4" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=0x0601 /W4 /wd4068 /wd4702" )
 else ( )
     message( FATAL_ERROR "Compiler not supported")
 endif ( )
diff --git a/example/compression/source/example.cpp b/example/compression/source/example.cpp
index 8f1835da..22e0004a 100644
--- a/example/compression/source/example.cpp
+++ b/example/compression/source/example.cpp
@@ -31,9 +31,9 @@ void deflate_method_handler( const shared_ptr< Session > session )
         
         if ( request->get_header( "Content-Encoding", String::lowercase ) == "deflate" )
         {
-            mz_ulong length = compressBound( body.size( ) );
+            mz_ulong length = compressBound( static_cast< mz_ulong >( body.size( ) ) );
             unsigned char* data = new unsigned char[ length ];
-            const int status = uncompress( data, &length, body.data( ), body.size( ) );
+            const int status = uncompress( data, &length, body.data( ), static_cast< mz_ulong >( body.size( ) ) );
             
             if ( status not_eq MZ_OK )
             {
diff --git a/example/session_manager/source/example.cpp b/example/session_manager/source/example.cpp
index 3ad098fc..3a724454 100644
--- a/example/session_manager/source/example.cpp
+++ b/example/session_manager/source/example.cpp
@@ -42,8 +42,10 @@ class InMemorySessionManager : public SessionManager
         void create( const function< void ( const shared_ptr< Session > ) >& callback )
         {
             static const string charset = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-            static uniform_int_distribution< > selector( 0, charset.size( ) - 1 );
-            static mt19937 generator( chrono::high_resolution_clock::now( ).time_since_epoch( ).count( ) );
+            static uniform_int_distribution< > selector( 0, 35 );
+			
+			auto seed = static_cast< unsigned int >( chrono::high_resolution_clock::now( ).time_since_epoch( ).count( ) );
+            static mt19937 generator( seed );
             
             string key = "";
             
@@ -64,8 +66,8 @@ class InMemorySessionManager : public SessionManager
             
             if ( previous_session not_eq sessions.end( ) )
             {
-                const auto key = previous_session->second->get_id( );
-                session->set_id( key );
+                const auto id = previous_session->second->get_id( );
+                session->set_id( id );
                 
                 for ( const auto key : previous_session->second->keys( ) )
                 {
diff --git a/source/corvusoft/restbed/detail/socket_impl.cpp b/source/corvusoft/restbed/detail/socket_impl.cpp
index 9e602dbe..fd74aec6 100644
--- a/source/corvusoft/restbed/detail/socket_impl.cpp
+++ b/source/corvusoft/restbed/detail/socket_impl.cpp
@@ -237,7 +237,7 @@ namespace restbed
             
 #endif
             struct timeval timeout = { 0, 0 };
-            timeout.tv_usec = value.count( ) * 1000;
+            timeout.tv_usec = static_cast< long >( value.count( ) * 1000 );
             
             int status = setsockopt( native_socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast< char* >( &timeout ), sizeof( timeout ) );
             
diff --git a/test/acceptance/source/custom_authentication/resource.cpp b/test/acceptance/source/custom_authentication/resource.cpp
index c694f0c5..da87a1fa 100644
--- a/test/acceptance/source/custom_authentication/resource.cpp
+++ b/test/acceptance/source/custom_authentication/resource.cpp
@@ -16,10 +16,7 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_authentication/service.cpp b/test/acceptance/source/custom_authentication/service.cpp
index dd850a6b..ab55e121 100644
--- a/test/acceptance/source/custom_authentication/service.cpp
+++ b/test/acceptance/source/custom_authentication/service.cpp
@@ -16,10 +16,9 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_error_handling/resource.cpp b/test/acceptance/source/custom_error_handling/resource.cpp
index a01d2286..8604900a 100644
--- a/test/acceptance/source/custom_error_handling/resource.cpp
+++ b/test/acceptance/source/custom_error_handling/resource.cpp
@@ -16,10 +16,9 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_error_handling/service.cpp b/test/acceptance/source/custom_error_handling/service.cpp
index 52082c2d..a31410b0 100644
--- a/test/acceptance/source/custom_error_handling/service.cpp
+++ b/test/acceptance/source/custom_error_handling/service.cpp
@@ -16,10 +16,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_failed_resource_filter_validation_handler/resource.cpp b/test/acceptance/source/custom_failed_resource_filter_validation_handler/resource.cpp
index e00babd1..3310ec93 100644
--- a/test/acceptance/source/custom_failed_resource_filter_validation_handler/resource.cpp
+++ b/test/acceptance/source/custom_failed_resource_filter_validation_handler/resource.cpp
@@ -16,10 +16,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_failed_resource_filter_validation_handler/service.cpp b/test/acceptance/source/custom_failed_resource_filter_validation_handler/service.cpp
index e2ca2a54..7ccac439 100644
--- a/test/acceptance/source/custom_failed_resource_filter_validation_handler/service.cpp
+++ b/test/acceptance/source/custom_failed_resource_filter_validation_handler/service.cpp
@@ -16,10 +16,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_connect.cpp b/test/acceptance/source/custom_http_methods/http_connect.cpp
index a46d86bd..7159bcda 100644
--- a/test/acceptance/source/custom_http_methods/http_connect.cpp
+++ b/test/acceptance/source/custom_http_methods/http_connect.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_delete.cpp b/test/acceptance/source/custom_http_methods/http_delete.cpp
index 024dafcd..fc6b9e14 100644
--- a/test/acceptance/source/custom_http_methods/http_delete.cpp
+++ b/test/acceptance/source/custom_http_methods/http_delete.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_get.cpp b/test/acceptance/source/custom_http_methods/http_get.cpp
index da4a37d5..cd8b63c9 100644
--- a/test/acceptance/source/custom_http_methods/http_get.cpp
+++ b/test/acceptance/source/custom_http_methods/http_get.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_head.cpp b/test/acceptance/source/custom_http_methods/http_head.cpp
index 700569ed..22bbd288 100644
--- a/test/acceptance/source/custom_http_methods/http_head.cpp
+++ b/test/acceptance/source/custom_http_methods/http_head.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_invoke.cpp b/test/acceptance/source/custom_http_methods/http_invoke.cpp
index d1732aec..81ff5e1e 100644
--- a/test/acceptance/source/custom_http_methods/http_invoke.cpp
+++ b/test/acceptance/source/custom_http_methods/http_invoke.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_options.cpp b/test/acceptance/source/custom_http_methods/http_options.cpp
index 462ddb79..807d3272 100644
--- a/test/acceptance/source/custom_http_methods/http_options.cpp
+++ b/test/acceptance/source/custom_http_methods/http_options.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_patch.cpp b/test/acceptance/source/custom_http_methods/http_patch.cpp
index 6309f8d0..e824d3d2 100644
--- a/test/acceptance/source/custom_http_methods/http_patch.cpp
+++ b/test/acceptance/source/custom_http_methods/http_patch.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_post.cpp b/test/acceptance/source/custom_http_methods/http_post.cpp
index cc630813..d0e56cee 100644
--- a/test/acceptance/source/custom_http_methods/http_post.cpp
+++ b/test/acceptance/source/custom_http_methods/http_post.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_put.cpp b/test/acceptance/source/custom_http_methods/http_put.cpp
index c9c944ca..83da476c 100644
--- a/test/acceptance/source/custom_http_methods/http_put.cpp
+++ b/test/acceptance/source/custom_http_methods/http_put.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_http_methods/http_trace.cpp b/test/acceptance/source/custom_http_methods/http_trace.cpp
index 088db4c8..2a33328a 100644
--- a/test/acceptance/source/custom_http_methods/http_trace.cpp
+++ b/test/acceptance/source/custom_http_methods/http_trace.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_method_not_allowed_handler/scenario.cpp b/test/acceptance/source/custom_method_not_allowed_handler/scenario.cpp
index dc29ed5b..e1de1e08 100644
--- a/test/acceptance/source/custom_method_not_allowed_handler/scenario.cpp
+++ b/test/acceptance/source/custom_method_not_allowed_handler/scenario.cpp
@@ -16,10 +16,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_method_not_implemented_handler/scenario.cpp b/test/acceptance/source/custom_method_not_implemented_handler/scenario.cpp
index abbe2e2d..15eeeb07 100644
--- a/test/acceptance/source/custom_method_not_implemented_handler/scenario.cpp
+++ b/test/acceptance/source/custom_method_not_implemented_handler/scenario.cpp
@@ -16,10 +16,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/custom_resource_not_found_handler/scenario.cpp b/test/acceptance/source/custom_resource_not_found_handler/scenario.cpp
index cc807c10..ebeb5f72 100644
--- a/test/acceptance/source/custom_resource_not_found_handler/scenario.cpp
+++ b/test/acceptance/source/custom_resource_not_found_handler/scenario.cpp
@@ -16,10 +16,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/http_method_handlers/http_connect.cpp b/test/acceptance/source/http_method_handlers/http_connect.cpp
index 2e8ace58..554a7771 100644
--- a/test/acceptance/source/http_method_handlers/http_connect.cpp
+++ b/test/acceptance/source/http_method_handlers/http_connect.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/http_method_handlers/http_delete.cpp b/test/acceptance/source/http_method_handlers/http_delete.cpp
index 912758c3..e6f423b1 100644
--- a/test/acceptance/source/http_method_handlers/http_delete.cpp
+++ b/test/acceptance/source/http_method_handlers/http_delete.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/http_method_handlers/http_get.cpp b/test/acceptance/source/http_method_handlers/http_get.cpp
index a1c68417..3cca0a22 100644
--- a/test/acceptance/source/http_method_handlers/http_get.cpp
+++ b/test/acceptance/source/http_method_handlers/http_get.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/http_method_handlers/http_head.cpp b/test/acceptance/source/http_method_handlers/http_head.cpp
index 0ca7f70a..c505b292 100644
--- a/test/acceptance/source/http_method_handlers/http_head.cpp
+++ b/test/acceptance/source/http_method_handlers/http_head.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/http_method_handlers/http_options.cpp b/test/acceptance/source/http_method_handlers/http_options.cpp
index 4d31886e..964125e9 100644
--- a/test/acceptance/source/http_method_handlers/http_options.cpp
+++ b/test/acceptance/source/http_method_handlers/http_options.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/http_method_handlers/http_patch.cpp b/test/acceptance/source/http_method_handlers/http_patch.cpp
index 9c04b110..bfc98633 100644
--- a/test/acceptance/source/http_method_handlers/http_patch.cpp
+++ b/test/acceptance/source/http_method_handlers/http_patch.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/http_method_handlers/http_post.cpp b/test/acceptance/source/http_method_handlers/http_post.cpp
index e9fa6948..d35ecc7e 100644
--- a/test/acceptance/source/http_method_handlers/http_post.cpp
+++ b/test/acceptance/source/http_method_handlers/http_post.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/http_method_handlers/http_put.cpp b/test/acceptance/source/http_method_handlers/http_put.cpp
index b78ce3f9..36db71ef 100644
--- a/test/acceptance/source/http_method_handlers/http_put.cpp
+++ b/test/acceptance/source/http_method_handlers/http_put.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/http_method_handlers/http_trace.cpp b/test/acceptance/source/http_method_handlers/http_trace.cpp
index 1b7b1137..5d7fcee4 100644
--- a/test/acceptance/source/http_method_handlers/http_trace.cpp
+++ b/test/acceptance/source/http_method_handlers/http_trace.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/path_parameters/scenario.cpp b/test/acceptance/source/path_parameters/scenario.cpp
index 1e5eab03..e7802f09 100644
--- a/test/acceptance/source/path_parameters/scenario.cpp
+++ b/test/acceptance/source/path_parameters/scenario.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publish_duplicate_resources/scenario.cpp b/test/acceptance/source/publish_duplicate_resources/scenario.cpp
index 253cbae7..7f699561 100644
--- a/test/acceptance/source/publish_duplicate_resources/scenario.cpp
+++ b/test/acceptance/source/publish_duplicate_resources/scenario.cpp
@@ -11,10 +11,8 @@
 #include <restbed>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/acceptance/source/publishing_multi_path_resources/http_connect.cpp b/test/acceptance/source/publishing_multi_path_resources/http_connect.cpp
index a0a23f7e..a6737cc5 100644
--- a/test/acceptance/source/publishing_multi_path_resources/http_connect.cpp
+++ b/test/acceptance/source/publishing_multi_path_resources/http_connect.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_multi_path_resources/http_delete.cpp b/test/acceptance/source/publishing_multi_path_resources/http_delete.cpp
index e5162474..906e420f 100644
--- a/test/acceptance/source/publishing_multi_path_resources/http_delete.cpp
+++ b/test/acceptance/source/publishing_multi_path_resources/http_delete.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_multi_path_resources/http_get.cpp b/test/acceptance/source/publishing_multi_path_resources/http_get.cpp
index c4020b15..4c67d6c2 100644
--- a/test/acceptance/source/publishing_multi_path_resources/http_get.cpp
+++ b/test/acceptance/source/publishing_multi_path_resources/http_get.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_multi_path_resources/http_head.cpp b/test/acceptance/source/publishing_multi_path_resources/http_head.cpp
index 8b84d486..88216dd6 100644
--- a/test/acceptance/source/publishing_multi_path_resources/http_head.cpp
+++ b/test/acceptance/source/publishing_multi_path_resources/http_head.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_multi_path_resources/http_options.cpp b/test/acceptance/source/publishing_multi_path_resources/http_options.cpp
index 3b346360..51d73dc9 100644
--- a/test/acceptance/source/publishing_multi_path_resources/http_options.cpp
+++ b/test/acceptance/source/publishing_multi_path_resources/http_options.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_multi_path_resources/http_patch.cpp b/test/acceptance/source/publishing_multi_path_resources/http_patch.cpp
index 83b19726..c8feb7b9 100644
--- a/test/acceptance/source/publishing_multi_path_resources/http_patch.cpp
+++ b/test/acceptance/source/publishing_multi_path_resources/http_patch.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_multi_path_resources/http_post.cpp b/test/acceptance/source/publishing_multi_path_resources/http_post.cpp
index ef7393c6..21e4480a 100644
--- a/test/acceptance/source/publishing_multi_path_resources/http_post.cpp
+++ b/test/acceptance/source/publishing_multi_path_resources/http_post.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_multi_path_resources/http_put.cpp b/test/acceptance/source/publishing_multi_path_resources/http_put.cpp
index b7a5747f..2d9a814d 100644
--- a/test/acceptance/source/publishing_multi_path_resources/http_put.cpp
+++ b/test/acceptance/source/publishing_multi_path_resources/http_put.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_multi_path_resources/http_trace.cpp b/test/acceptance/source/publishing_multi_path_resources/http_trace.cpp
index 19d0dd5b..e9ca7500 100644
--- a/test/acceptance/source/publishing_multi_path_resources/http_trace.cpp
+++ b/test/acceptance/source/publishing_multi_path_resources/http_trace.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_single_path_resources/http_connect.cpp b/test/acceptance/source/publishing_single_path_resources/http_connect.cpp
index 617007ae..35c7ac8f 100644
--- a/test/acceptance/source/publishing_single_path_resources/http_connect.cpp
+++ b/test/acceptance/source/publishing_single_path_resources/http_connect.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_single_path_resources/http_delete.cpp b/test/acceptance/source/publishing_single_path_resources/http_delete.cpp
index 407838d0..ca272d6a 100644
--- a/test/acceptance/source/publishing_single_path_resources/http_delete.cpp
+++ b/test/acceptance/source/publishing_single_path_resources/http_delete.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_single_path_resources/http_get.cpp b/test/acceptance/source/publishing_single_path_resources/http_get.cpp
index 5a2bf531..c0288224 100644
--- a/test/acceptance/source/publishing_single_path_resources/http_get.cpp
+++ b/test/acceptance/source/publishing_single_path_resources/http_get.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_single_path_resources/http_head.cpp b/test/acceptance/source/publishing_single_path_resources/http_head.cpp
index d90855d2..a7109d76 100644
--- a/test/acceptance/source/publishing_single_path_resources/http_head.cpp
+++ b/test/acceptance/source/publishing_single_path_resources/http_head.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_single_path_resources/http_options.cpp b/test/acceptance/source/publishing_single_path_resources/http_options.cpp
index 0aa1f950..d12a12f5 100644
--- a/test/acceptance/source/publishing_single_path_resources/http_options.cpp
+++ b/test/acceptance/source/publishing_single_path_resources/http_options.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_single_path_resources/http_patch.cpp b/test/acceptance/source/publishing_single_path_resources/http_patch.cpp
index de3e0425..ed7e2b7e 100644
--- a/test/acceptance/source/publishing_single_path_resources/http_patch.cpp
+++ b/test/acceptance/source/publishing_single_path_resources/http_patch.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_single_path_resources/http_post.cpp b/test/acceptance/source/publishing_single_path_resources/http_post.cpp
index 4ea4c89d..9f610706 100644
--- a/test/acceptance/source/publishing_single_path_resources/http_post.cpp
+++ b/test/acceptance/source/publishing_single_path_resources/http_post.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_single_path_resources/http_put.cpp b/test/acceptance/source/publishing_single_path_resources/http_put.cpp
index 129e956e..2956a5ba 100644
--- a/test/acceptance/source/publishing_single_path_resources/http_put.cpp
+++ b/test/acceptance/source/publishing_single_path_resources/http_put.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/publishing_single_path_resources/http_trace.cpp b/test/acceptance/source/publishing_single_path_resources/http_trace.cpp
index 871ac7b3..c8fb0ddc 100644
--- a/test/acceptance/source/publishing_single_path_resources/http_trace.cpp
+++ b/test/acceptance/source/publishing_single_path_resources/http_trace.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/query_parameters/scenario.cpp b/test/acceptance/source/query_parameters/scenario.cpp
index 99ac4c2c..5871a9b9 100644
--- a/test/acceptance/source/query_parameters/scenario.cpp
+++ b/test/acceptance/source/query_parameters/scenario.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/resource_method_filters/scenario.cpp b/test/acceptance/source/resource_method_filters/scenario.cpp
index a3beddd2..eb1ef161 100644
--- a/test/acceptance/source/resource_method_filters/scenario.cpp
+++ b/test/acceptance/source/resource_method_filters/scenario.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/rules_engine/mixed.cpp b/test/acceptance/source/rules_engine/mixed.cpp
index cd128b6d..bf4d15c7 100644
--- a/test/acceptance/source/rules_engine/mixed.cpp
+++ b/test/acceptance/source/rules_engine/mixed.cpp
@@ -18,10 +18,8 @@
 #include "content_length_rule.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/rules_engine/resource.cpp b/test/acceptance/source/rules_engine/resource.cpp
index 3d120931..cbc0c24d 100644
--- a/test/acceptance/source/rules_engine/resource.cpp
+++ b/test/acceptance/source/rules_engine/resource.cpp
@@ -18,10 +18,8 @@
 #include "content_length_rule.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/rules_engine/service.cpp b/test/acceptance/source/rules_engine/service.cpp
index 8266afc6..f84ceadf 100644
--- a/test/acceptance/source/rules_engine/service.cpp
+++ b/test/acceptance/source/rules_engine/service.cpp
@@ -18,10 +18,8 @@
 #include "content_length_rule.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/runtime_service_modifications/scenario.cpp b/test/acceptance/source/runtime_service_modifications/scenario.cpp
index 933f5cde..e1af9333 100644
--- a/test/acceptance/source/runtime_service_modifications/scenario.cpp
+++ b/test/acceptance/source/runtime_service_modifications/scenario.cpp
@@ -14,10 +14,8 @@
 #include <restbed>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/service_case_sensitivity/case_insensitive.cpp b/test/acceptance/source/service_case_sensitivity/case_insensitive.cpp
index b20be7d0..73dcce65 100644
--- a/test/acceptance/source/service_case_sensitivity/case_insensitive.cpp
+++ b/test/acceptance/source/service_case_sensitivity/case_insensitive.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/acceptance/source/service_case_sensitivity/case_sensitive.cpp b/test/acceptance/source/service_case_sensitivity/case_sensitive.cpp
index d9a29601..51499fd2 100644
--- a/test/acceptance/source/service_case_sensitivity/case_sensitive.cpp
+++ b/test/acceptance/source/service_case_sensitivity/case_sensitive.cpp
@@ -15,10 +15,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/integration/source/resource_suite.cpp b/test/integration/source/resource_suite.cpp
index a2c39342..50a86501 100644
--- a/test/integration/source/resource_suite.cpp
+++ b/test/integration/source/resource_suite.cpp
@@ -12,10 +12,8 @@
 #include <corvusoft/restbed/resource.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/integration/source/response_suite.cpp b/test/integration/source/response_suite.cpp
index c041d4fb..342f48b2 100644
--- a/test/integration/source/response_suite.cpp
+++ b/test/integration/source/response_suite.cpp
@@ -11,10 +11,8 @@
 #include <corvusoft/restbed/response.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/integration/source/session_suite.cpp b/test/integration/source/session_suite.cpp
index 8440e378..c18bd159 100644
--- a/test/integration/source/session_suite.cpp
+++ b/test/integration/source/session_suite.cpp
@@ -14,10 +14,8 @@
 #include <corvusoft/restbed/resource.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::set;
diff --git a/test/integration/source/settings_suite.cpp b/test/integration/source/settings_suite.cpp
index e8d4791c..9ef975ae 100644
--- a/test/integration/source/settings_suite.cpp
+++ b/test/integration/source/settings_suite.cpp
@@ -10,10 +10,8 @@
 #include <corvusoft/restbed/ssl_settings.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::shared_ptr;
diff --git a/test/integration/source/ssl_settings_suite.cpp b/test/integration/source/ssl_settings_suite.cpp
index 0207df37..60e806d4 100644
--- a/test/integration/source/ssl_settings_suite.cpp
+++ b/test/integration/source/ssl_settings_suite.cpp
@@ -10,10 +10,8 @@
 #include <corvusoft/restbed/ssl_settings.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/integration/source/string_suite.cpp b/test/integration/source/string_suite.cpp
index 44882539..990d7d01 100644
--- a/test/integration/source/string_suite.cpp
+++ b/test/integration/source/string_suite.cpp
@@ -11,10 +11,8 @@
 #include "corvusoft/restbed/string.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/regression/source/content_length_present_on_empty_response_body.cpp b/test/regression/source/content_length_present_on_empty_response_body.cpp
index 6fca955d..727b7a42 100644
--- a/test/regression/source/content_length_present_on_empty_response_body.cpp
+++ b/test/regression/source/content_length_present_on_empty_response_body.cpp
@@ -12,10 +12,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/content_type_present_on_empty_response_body.cpp b/test/regression/source/content_type_present_on_empty_response_body.cpp
index e14a6de9..7c158634 100644
--- a/test/regression/source/content_type_present_on_empty_response_body.cpp
+++ b/test/regression/source/content_type_present_on_empty_response_body.cpp
@@ -12,10 +12,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/error_handler_not_overwritten.cpp b/test/regression/source/error_handler_not_overwritten.cpp
index 132633a1..c25ddb77 100644
--- a/test/regression/source/error_handler_not_overwritten.cpp
+++ b/test/regression/source/error_handler_not_overwritten.cpp
@@ -13,10 +13,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/exception_thrown_with_space_in_resource_path.cpp b/test/regression/source/exception_thrown_with_space_in_resource_path.cpp
index 2a89d09d..cb5b3b5a 100644
--- a/test/regression/source/exception_thrown_with_space_in_resource_path.cpp
+++ b/test/regression/source/exception_thrown_with_space_in_resource_path.cpp
@@ -12,10 +12,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/fails_to_parse_header_values_containing_colons.cpp b/test/regression/source/fails_to_parse_header_values_containing_colons.cpp
index 9cfae01c..75ae2e0c 100644
--- a/test/regression/source/fails_to_parse_header_values_containing_colons.cpp
+++ b/test/regression/source/fails_to_parse_header_values_containing_colons.cpp
@@ -16,10 +16,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/fails_to_parse_identical_query_parameters.cpp b/test/regression/source/fails_to_parse_identical_query_parameters.cpp
index fba59470..f3ea4bdd 100644
--- a/test/regression/source/fails_to_parse_identical_query_parameters.cpp
+++ b/test/regression/source/fails_to_parse_identical_query_parameters.cpp
@@ -17,10 +17,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/large_request_bodies_being_trimmed.cpp b/test/regression/source/large_request_bodies_being_trimmed.cpp
index 930f0821..5adeaef1 100644
--- a/test/regression/source/large_request_bodies_being_trimmed.cpp
+++ b/test/regression/source/large_request_bodies_being_trimmed.cpp
@@ -14,10 +14,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/missing_regex_support_on_gcc_4.8.cpp b/test/regression/source/missing_regex_support_on_gcc_4.8.cpp
index 8177f8d2..7b7bd137 100644
--- a/test/regression/source/missing_regex_support_on_gcc_4.8.cpp
+++ b/test/regression/source/missing_regex_support_on_gcc_4.8.cpp
@@ -8,10 +8,8 @@
 //Project Includes
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 
diff --git a/test/regression/source/path_parameters_are_not_visible_within_rules.cpp b/test/regression/source/path_parameters_are_not_visible_within_rules.cpp
index 5c49bdfe..6a9b85f4 100644
--- a/test/regression/source/path_parameters_are_not_visible_within_rules.cpp
+++ b/test/regression/source/path_parameters_are_not_visible_within_rules.cpp
@@ -12,10 +12,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/request_get_parameters_fails_to_return_data.cpp b/test/regression/source/request_get_parameters_fails_to_return_data.cpp
index ba49ae07..6646f0f7 100644
--- a/test/regression/source/request_get_parameters_fails_to_return_data.cpp
+++ b/test/regression/source/request_get_parameters_fails_to_return_data.cpp
@@ -12,10 +12,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/request_uris_are_not_being_decoded.cpp b/test/regression/source/request_uris_are_not_being_decoded.cpp
index 913d163b..84be5299 100644
--- a/test/regression/source/request_uris_are_not_being_decoded.cpp
+++ b/test/regression/source/request_uris_are_not_being_decoded.cpp
@@ -12,10 +12,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/resource_instance_destroyed_with_bound_method_functors.cpp b/test/regression/source/resource_instance_destroyed_with_bound_method_functors.cpp
index 1574868c..bf4ae6de 100644
--- a/test/regression/source/resource_instance_destroyed_with_bound_method_functors.cpp
+++ b/test/regression/source/resource_instance_destroyed_with_bound_method_functors.cpp
@@ -12,10 +12,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/resource_responding_on_invalid_path.cpp b/test/regression/source/resource_responding_on_invalid_path.cpp
index 702027ce..a9cd6962 100644
--- a/test/regression/source/resource_responding_on_invalid_path.cpp
+++ b/test/regression/source/resource_responding_on_invalid_path.cpp
@@ -12,10 +12,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/resources_are_not_overwritten.cpp b/test/regression/source/resources_are_not_overwritten.cpp
index a293dd02..d3379964 100644
--- a/test/regression/source/resources_are_not_overwritten.cpp
+++ b/test/regression/source/resources_are_not_overwritten.cpp
@@ -11,10 +11,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/segmentation_fault_on_mismatched_path.cpp b/test/regression/source/segmentation_fault_on_mismatched_path.cpp
index 2f06d015..c916a7d6 100644
--- a/test/regression/source/segmentation_fault_on_mismatched_path.cpp
+++ b/test/regression/source/segmentation_fault_on_mismatched_path.cpp
@@ -12,10 +12,8 @@
 #include "http.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/string_replace_fails_to_replace_embedded_targets.cpp b/test/regression/source/string_replace_fails_to_replace_embedded_targets.cpp
index a367653c..8aff2173 100644
--- a/test/regression/source/string_replace_fails_to_replace_embedded_targets.cpp
+++ b/test/regression/source/string_replace_fails_to_replace_embedded_targets.cpp
@@ -9,10 +9,8 @@
 #include "corvusoft/restbed/string.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/regression/source/uncaught_exception_when_peer_closes_connection.cpp b/test/regression/source/uncaught_exception_when_peer_closes_connection.cpp
index 4991d586..9b3865f4 100644
--- a/test/regression/source/uncaught_exception_when_peer_closes_connection.cpp
+++ b/test/regression/source/uncaught_exception_when_peer_closes_connection.cpp
@@ -14,10 +14,8 @@
 
 //External Includes
 #include <asio.hpp>
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::thread;
diff --git a/test/regression/source/uri_fails_to_handle_file_scheme_relative_paths.cpp b/test/regression/source/uri_fails_to_handle_file_scheme_relative_paths.cpp
index 604e5481..c8f63067 100644
--- a/test/regression/source/uri_fails_to_handle_file_scheme_relative_paths.cpp
+++ b/test/regression/source/uri_fails_to_handle_file_scheme_relative_paths.cpp
@@ -10,10 +10,8 @@
 #include <restbed>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/unit/source/request_suite.cpp b/test/unit/source/request_suite.cpp
index 70aca31d..c864e0c6 100644
--- a/test/unit/source/request_suite.cpp
+++ b/test/unit/source/request_suite.cpp
@@ -10,10 +10,8 @@
 #include <corvusoft/restbed/request.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::map;
@@ -86,7 +84,7 @@ TEST_CASE( "validate getter default value", "[request]" )
     SECTION( "unsigned long" )
     {
         unsigned long value;
-        unsigned long default_value = -33;
+        unsigned long default_value = unsigned long( -33 );
         request.get_header( "Var", value, default_value );
         REQUIRE( value == default_value );
     }
@@ -101,7 +99,7 @@ TEST_CASE( "validate getter default value", "[request]" )
     SECTION( "float" )
     {
         float value;
-        request.get_header( "Var", value, 3.6 );
+        request.get_header( "Var", value, float( 3.6 ) );
         REQUIRE( value == 3.6f );
     }
     
diff --git a/test/unit/source/resource_suite.cpp b/test/unit/source/resource_suite.cpp
index 9ea40ba5..c0d7c2db 100644
--- a/test/unit/source/resource_suite.cpp
+++ b/test/unit/source/resource_suite.cpp
@@ -9,10 +9,8 @@
 #include <corvusoft/restbed/resource.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 
diff --git a/test/unit/source/response_suite.cpp b/test/unit/source/response_suite.cpp
index 1d521df4..a41f53d9 100644
--- a/test/unit/source/response_suite.cpp
+++ b/test/unit/source/response_suite.cpp
@@ -10,10 +10,8 @@
 #include <corvusoft/restbed/response.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/unit/source/service_suite.cpp b/test/unit/source/service_suite.cpp
index 390f35df..21c0a027 100644
--- a/test/unit/source/service_suite.cpp
+++ b/test/unit/source/service_suite.cpp
@@ -8,10 +8,8 @@
 #include <corvusoft/restbed/service.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 
diff --git a/test/unit/source/session_suite.cpp b/test/unit/source/session_suite.cpp
index 713ad51e..50daa9d3 100644
--- a/test/unit/source/session_suite.cpp
+++ b/test/unit/source/session_suite.cpp
@@ -12,10 +12,8 @@
 #include <corvusoft/restbed/session.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::set;
diff --git a/test/unit/source/settings_suite.cpp b/test/unit/source/settings_suite.cpp
index 9de78619..a5a0a604 100644
--- a/test/unit/source/settings_suite.cpp
+++ b/test/unit/source/settings_suite.cpp
@@ -11,10 +11,8 @@
 #include <corvusoft/restbed/settings.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::map;
diff --git a/test/unit/source/ssl_settings_suite.cpp b/test/unit/source/ssl_settings_suite.cpp
index 0473520c..e718c59a 100644
--- a/test/unit/source/ssl_settings_suite.cpp
+++ b/test/unit/source/ssl_settings_suite.cpp
@@ -10,10 +10,8 @@
 #include <corvusoft/restbed/ssl_settings.hpp>
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/unit/source/string_suite.cpp b/test/unit/source/string_suite.cpp
index b1f2a5e1..1aebfb6d 100644
--- a/test/unit/source/string_suite.cpp
+++ b/test/unit/source/string_suite.cpp
@@ -11,10 +11,8 @@
 #include "corvusoft/restbed/string.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
+
 
 //System Namespaces
 using std::string;
diff --git a/test/unit/source/uri_suite.cpp b/test/unit/source/uri_suite.cpp
index fcc34121..e0383220 100644
--- a/test/unit/source/uri_suite.cpp
+++ b/test/unit/source/uri_suite.cpp
@@ -11,10 +11,7 @@
 #include "corvusoft/restbed/uri.hpp"
 
 //External Includes
-#pragma warning( push )
-#pragma warning( disable:4702 )
 #include <catch.hpp>
-#pragma warning( pop )
 
 //System Namespaces
 using std::string;