Fixed some warnings from code

awwit · awwit · commit 1a179e871e9d · 2016-05-31T14:48:17.000+03:00
diff --git a/src/SocketAdapterTls.cpp b/src/SocketAdapterTls.cpp
@@ -55,7 +55,7 @@ namespace HttpServer
 
 		while (total < length)
 		{
-			::gnutls_record_set_timeout(this->session, timeout.count() );
+			::gnutls_record_set_timeout(this->session, static_cast<unsigned int>(timeout.count() ) );
 
 			if (record_size > length - total)
 			{
@@ -92,7 +92,7 @@ namespace HttpServer
 
 	long SocketAdapterTls::nonblock_recv(std::vector<std::string::value_type> &buf, const std::chrono::milliseconds &timeout) const
 	{
-		::gnutls_record_set_timeout(this->session, timeout.count() );
+		::gnutls_record_set_timeout(this->session, static_cast<unsigned int>(timeout.count() ) );
 		return ::gnutls_record_recv(this->session, buf.data(), buf.size() );
 	}
 
diff --git a/src/System.h b/src/System.h
@@ -3,6 +3,9 @@
 #ifdef WIN32
 	#include <WS2tcpip.h>
 	#include <Windows.h>
+	#undef min
+	#undef max
+
 	::TCHAR myWndClassName[];
 
     #ifdef SIGTERM
diff --git a/src/Utils.cpp b/src/Utils.cpp
@@ -280,7 +280,7 @@ namespace Utils
 
 		// Parse RFC 822
 	#ifdef WIN32
-		if (~0 != ::sscanf_s(strTime.c_str(), "%*s %d %3s %d %d:%d:%d", &tc.tm_mday, s_mon.data(), s_mon.size(), &tc.tm_year, &tc.tm_hour, &tc.tm_min, &tc.tm_sec) )
+		if (~0 != ::sscanf_s(strTime.c_str(), "%*s %d %3s %d %d:%d:%d", &tc.tm_mday, s_mon.data(), static_cast<unsigned int>(s_mon.size() ), &tc.tm_year, &tc.tm_hour, &tc.tm_min, &tc.tm_sec) )
 	#else
 		if (~0 != ::sscanf(strTime.c_str(), "%*s %d %3s %d %d:%d:%d", &tc.tm_mday, s_mon.data(), &tc.tm_year, &tc.tm_hour, &tc.tm_min, &tc.tm_sec) )
 	#endif

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ namespace HttpServer`
`55`	`55`
`56`	`56`	`while (total < length)`
`57`	`57`	`{`
`58`		`- ::gnutls_record_set_timeout(this->session, timeout.count() );`
	`58`	`+ ::gnutls_record_set_timeout(this->session, static_cast<unsigned int>(timeout.count() ) );`
`59`	`59`
`60`	`60`	`if (record_size > length - total)`
`61`	`61`	`{`
`@@ -92,7 +92,7 @@ namespace HttpServer`
`92`	`92`
`93`	`93`	`long SocketAdapterTls::nonblock_recv(std::vector<std::string::value_type> &buf, const std::chrono::milliseconds &timeout) const`
`94`	`94`	`{`
`95`		`- ::gnutls_record_set_timeout(this->session, timeout.count() );`
	`95`	`+ ::gnutls_record_set_timeout(this->session, static_cast<unsigned int>(timeout.count() ) );`
`96`	`96`	`return ::gnutls_record_recv(this->session, buf.data(), buf.size() );`
`97`	`97`	`}`
`98`	`98`