Silenced remaining VS2015 warnings. Resolved #17.

Corvusoft · Sep 25, 2015 · 6d6eb19 · 6d6eb19
1 parent ecc10ac
commit 6d6eb19
Show file tree

Hide file tree

Showing 93 changed files with 101 additions and 277 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;