Merge pull request facebookarchive#5 from jaynus/patch_upstream

Fixes build errors in MSVC 2014/2015 compiling with latest CMake and …
rhard · Aug 2, 2017 · 6153db0 · 6153db0
2 parents e40de85 + c9ddb6a
commit 6153db0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Lib/LibStatic/CMakeLists.txt b/Lib/LibStatic/CMakeLists.txt
@@ -17,7 +17,7 @@ IF(WIN32 AND NOT UNIX)
 
 	IF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles")
 
-		IF( MSVC10 OR MSVC11 OR MSVC12 )
+		IF( MSVC10 OR MSVC11 OR MSVC12 OR MSVC14 )
 			set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:\"LIBCD.lib LIBCMTD.lib MSVCRT.lib\"" )
 		ELSE()
 			set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:&quot;LIBCD.lib LIBCMTD.lib MSVCRT.lib&quot;" )

diff --git a/Source/CCRakNetSlidingWindow.cpp b/Source/CCRakNetSlidingWindow.cpp
@@ -22,7 +22,7 @@ static const CCTimeType SYN=10000;
 
 #include "MTUSize.h"
 #include <stdio.h>
-#include <math.h>
+#include <cmath>
 #include <stdlib.h>
 #include "RakAssert.h"
 #include "RakAlloca.h"
@@ -218,7 +218,7 @@ void CCRakNetSlidingWindow::OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBA
 		double d = .05;
 		double difference = rtt - estimatedRTT;
 		estimatedRTT = estimatedRTT + d * difference;
-		deviationRtt = deviationRtt + d * (abs(difference) - deviationRtt);
+		deviationRtt = deviationRtt + d * (std::abs(difference) - deviationRtt);
 	}
 
 	_isContinuousSend=isContinuousSend;