Home Explore Help
Sign In
cpp
/
JoltPhysics
mirror of https://github.com/jrouwe/JoltPhysics.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Moved <algorithm> to Core.h because it contains the definition for std::min/max so it is needed everywhere. (#220)

Jorrit Rouwe 2 years ago
parent
0981524bd2
commit
68781d9336
3 changed files with 1 additions and 8 deletions
Unified View Show Diff Stats
  1. 1 0
      Jolt/Core/Core.h
  2. 0 4
      Jolt/Core/JobSystemThreadPool.cpp
  3. 0 4
      Jolt/Geometry/EPAConvexHullBuilder.h

+ 1 - 0
Jolt/Core/Core.h
View File 

@@ -235,6 +235,7 @@ JPH_SUPPRESS_WARNINGS_STD_BEGIN
 
 #include <cmath>
 
 #include <cmath>
 
 #include <sstream>
 
 #include <sstream>
 
 #include <functional>
 
 #include <functional>
 
+#include <algorithm>
 
 JPH_SUPPRESS_WARNINGS_STD_END
 
 JPH_SUPPRESS_WARNINGS_STD_END
 
 #include <limits.h>
 
 #include <limits.h>
 
 #include <float.h>
 
 #include <float.h>

+ 0 - 4
Jolt/Core/JobSystemThreadPool.cpp
View File 

@@ -7,10 +7,6 @@
 
 #include <Jolt/Core/Profiler.h>
 
 #include <Jolt/Core/Profiler.h>
 
 #include <Jolt/Core/FPException.h>
 
 #include <Jolt/Core/FPException.h>
 
 
 
-JPH_SUPPRESS_WARNINGS_STD_BEGIN
 
-#include <algorithm>
 
-JPH_SUPPRESS_WARNINGS_STD_END
 
-
 
 #ifdef JPH_PLATFORM_WINDOWS
 
 #ifdef JPH_PLATFORM_WINDOWS
 
 	JPH_SUPPRESS_WARNING_PUSH
 
 	JPH_SUPPRESS_WARNING_PUSH
 
 	JPH_MSVC_SUPPRESS_WARNING(5039) // winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
 
 	JPH_MSVC_SUPPRESS_WARNING(5039) // winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.

+ 0 - 4
Jolt/Geometry/EPAConvexHullBuilder.h
View File 

@@ -16,10 +16,6 @@
 
 	#include <Jolt/Core/StringTools.h>
 
 	#include <Jolt/Core/StringTools.h>
 
 #endif
 
 #endif
 
 
 
-JPH_SUPPRESS_WARNINGS_STD_BEGIN
 
-#include <algorithm>
 
-JPH_SUPPRESS_WARNINGS_STD_END
 
-
 
 JPH_NAMESPACE_BEGIN
 
 JPH_NAMESPACE_BEGIN
 
 
 
 /// A convex hull builder specifically made for the EPA penetration depth calculation. It trades accuracy for speed and will simply abort of the hull forms defects due to numerical precision problems.
 
 /// A convex hull builder specifically made for the EPA penetration depth calculation. It trades accuracy for speed and will simply abort of the hull forms defects due to numerical precision problems.