Merge pull request #37 from DragoonX6/master

Fixing MingW/Clang issues on Windows.

CMakeLists.txt

@@ -36,7 +36,8 @@ endif()
 #-------------------------------------------------------------------------------------------
 add_definitions(-D_CHAR16T)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-add_definitions(-DEASTL_OPENSOURCE)
+add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+add_definitions(-DEASTL_OPENSOURCE=1)
 
 #-------------------------------------------------------------------------------------------
 # Library definition
@@ -48,12 +49,22 @@ add_library(EASTL ${EASTL_SOURCES})
 # Compiler Flags
 #-------------------------------------------------------------------------------------------
 set_property(TARGET EASTL PROPERTY CXX_STANDARD 11)
+
+if(EASTL_BUILD_TESTS OR EASTL_BUILD_BENCHMARK)
+	set_property(TARGET EAStdC EATest PROPERTY CXX_STANDARD 11)
+endif()
+
 if( UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fasm-blocks" )
 endif()
 
-if(UNIX)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
 endif()
 
 #-------------------------------------------------------------------------------------------

benchmark/CMakeLists.txt

@@ -9,6 +9,11 @@ cmake_minimum_required(VERSION 3.1)
 project(EASTLBenchmarks CXX)
 include(CTest)
 
+#-------------------------------------------------------------------------------------------
+# Defines
+#-------------------------------------------------------------------------------------------
+add_definitions(-D_CHAR16T)
+
 #-------------------------------------------------------------------------------------------
 # Include directories 
 #-------------------------------------------------------------------------------------------
@@ -19,8 +24,25 @@ include_directories(../test/source)
 # Compiler Flags
 #-------------------------------------------------------------------------------------------
 set(CMAKE_CXX_STANDARD 11)
-if(UNIX)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+endif()
+
+# Work around a crash bug that only occurs with MingW when compiled with optimizations enabled and a dynamic runtime.
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND MINGW)
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -static")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -static")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -static")
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_BUILD_TYPE MATCHES "MinSizeRel" AND MINGW)
+	message(FATAL_ERROR "FIXME: MinSizeRel on MingW's Clang fails to link.")
 endif()
 
 #-------------------------------------------------------------------------------------------
@@ -33,19 +55,23 @@ set(SOURCES ${EASTLBENCHMARK_SOURCES})
 # Defines 
 #-------------------------------------------------------------------------------------------
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 add_definitions(-DEASTL_THREAD_SUPPORT_AVAILABLE=0)
-add_definitions(-DEASTL_OPENSOURCE)
+add_definitions(-DEASTL_OPENSOURCE=1)
 add_definitions(-D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS)  # silence std::hash_map deprecation warnings
 
 #-------------------------------------------------------------------------------------------
 # Executable definition
 #-------------------------------------------------------------------------------------------
 add_executable(EASTLBenchmarks ${EASTLBENCHMARK_SOURCES})
 
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+
 set(EASTLBenchmark_Libraries
     EASTL
     EATest)
-target_link_libraries(EASTLBenchmarks ${EASTLBenchmark_Libraries})
+target_link_libraries(EASTLBenchmarks ${EASTLBenchmark_Libraries} Threads::Threads)
 
 #-------------------------------------------------------------------------------------------
 # Run Unit tests and verify the results. 

benchmark/source/BenchmarkHash.cpp

@@ -22,6 +22,8 @@
 		#define STD_HASH_SUPPORTED 0
 	#elif defined(EA_COMPILER_GNUC) && (EA_COMPILER_VERSION >= 4006) // To consider: Find a better way to identify the switchover from pre-C++11 hash containers to C++11 hash containers.
 		#define STD_HASH_SUPPORTED 0 // Need to use std::unordered_map, etc. instead of hash_map, etc.
+	#elif defined(EA_COMPILER_CLANG) && (EA_COMPILER_CPP11_ENABLED) // Bad way to determine if we have C++11 hash containers
+		#define STD_HASH_SUPPORTED 0
 	#else
 		#define STD_HASH_SUPPORTED 1
 	#endif
@@ -34,7 +36,7 @@
 	#pragma warning(disable: 4350) // behavior change: X called instead of Y
 #endif
 #if STD_HASH_SUPPORTED
-	#if defined(__GNUC__) && (defined(_CXXCONFIG) || defined(EA_PLATFORM_UNIX))
+	#if (defined(EA_COMPILER_GNUC) || defined(EA_COMPILER_CLANG)) && (defined(_CXXCONFIG) || defined(EA_PLATFORM_UNIX) || defined(EA_PLATFORM_MINGW))
 		#include <ext/hash_map>
 	#else
 		#include <hash_map>

benchmark/source/BenchmarkString.cpp

@@ -375,7 +375,7 @@ void BenchmarkString()
 
 			const char16_t pFind1_16[kFind1Size] = { 'p', 'a', 't', 't', 'e', 'r', 'n' };
 
-			#if !defined(EA_PLATFORM_IPHONE) // Crashes on iPhone.
+			#if !defined(EA_PLATFORM_IPHONE) && (!defined(EA_COMPILER_CLANG) && defined(EA_PLATFORM_MINGW)) // Crashes on iPhone.
 			  ss16.insert(ss8.size() / 2, pFind1_16);
 			#endif
 			es16.insert(es8.size() / 2, pFind1_16);

benchmark/source/EASTLBenchmark.cpp

@@ -58,7 +58,7 @@ namespace Benchmark
 		return valueDest;
 	}
 
-	static void WriteTime(int64_t timeNS, eastl::string& sTime)
+	void WriteTime(int64_t timeNS, eastl::string& sTime)
 	{
 		if(timeNS > 1000000000)
 			sTime.sprintf(" %6.2f s",  (double)timeNS / 1000000000);

benchmark/source/EASTLBenchmark.h

@@ -100,6 +100,7 @@ namespace Benchmark
 	void DoNothing(...);
 	void AddResult(const char* pName, int units, int64_t nTime1, int64_t nTime2, const char* pNotes = NULL);
 	void PrintResults();
+	void WriteTime(int64_t timeNS, eastl::string& sTime);
 
 
 } // namespace Benchmark

benchmark/source/main.cpp

@@ -164,7 +164,11 @@ int EAMain(int argc, char* argv[])
 	#endif
 
 	Benchmark::PrintResults();
-	EASTLTest_Printf("Time to complete all tests: %.1f seconds.\n", stopwatch.GetElapsedTimeFloat());
+
+	eastl::string sClockTime;
+	Benchmark::WriteTime(stopwatch.GetElapsedTime(), sClockTime);
+
+	EASTLTest_Printf("Time to complete all tests: %s.\n", sClockTime.c_str());
 
 	// Done
 	if(bWaitAtEnd)

include/EASTL/bitset.h

@@ -1805,7 +1805,7 @@ EA_RESTORE_GCC_WARNING()
 		: base_type(value)
 	{
 		if((N & kBitsPerWordMask) || (N == 0)) // If there are any high bits to clear... (If we didn't have this check, then the code below would do the wrong thing when N == 32.
-			mWord[kWordCount - 1] &= ~(~static_cast<word_type>(0) << (N & kBitsPerWordMask)); // This clears any high unused bits.
+			mWord[kWordCount - 1] &= ~(static_cast<word_type>(~static_cast<word_type>(0)) << (N & kBitsPerWordMask)); // This clears any high unused bits.
 	}
 	EA_RESTORE_VC_WARNING()
 
@@ -1856,7 +1856,7 @@ EA_RESTORE_GCC_WARNING()
 			EA_DISABLE_VC_WARNING(6313)
 			base_type::operator<<=(n);
 			if((N & kBitsPerWordMask) || (N == 0)) // If there are any high bits to clear... (If we didn't have this check, then the code below would do the wrong thing when N == 32.
-				mWord[kWordCount - 1] &= ~(~static_cast<word_type>(0) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
+				mWord[kWordCount - 1] &= ~(static_cast<word_type>(~static_cast<word_type>(0)) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
 			EA_RESTORE_VC_WARNING()
 		}
 		else
@@ -1883,7 +1883,7 @@ EA_RESTORE_GCC_WARNING()
 	{
 		base_type::set(); // This sets all bits.
 		if((N & kBitsPerWordMask) || (N == 0)) // If there are any high bits to clear... (If we didn't have this check, then the code below would do the wrong thing when N == 32.
-			mWord[kWordCount - 1] &= ~(~static_cast<word_type>(0) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
+			mWord[kWordCount - 1] &= ~(static_cast<word_type>(~static_cast<word_type>(0)) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
 		return *this;
 	}
 
@@ -1948,7 +1948,7 @@ EA_RESTORE_GCC_WARNING()
 		EA_DISABLE_VC_WARNING(6313)
 		base_type::flip();
 		if((N & kBitsPerWordMask) || (N == 0)) // If there are any high bits to clear... (If we didn't have this check, then the code below would do the wrong thing when N == 32.
-			mWord[kWordCount - 1] &= ~(~static_cast<word_type>(0) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
+			mWord[kWordCount - 1] &= ~(static_cast<word_type>(~static_cast<word_type>(0)) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
 		return *this;
 		EA_RESTORE_VC_WARNING()
 	}
@@ -2028,7 +2028,7 @@ EA_RESTORE_GCC_WARNING()
 		base_type::from_uint32(value);
 
 		if((N & kBitsPerWordMask) || (N == 0)) // If there are any high bits to clear... (If we didn't have this check, then the code below would do the wrong thing when N == 32.
-			mWord[kWordCount - 1] &= ~(~static_cast<word_type>(0) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
+			mWord[kWordCount - 1] &= ~(static_cast<word_type>(~static_cast<word_type>(0)) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
 	}
 
 
@@ -2038,7 +2038,7 @@ EA_RESTORE_GCC_WARNING()
 		base_type::from_uint64(value);
 
 		if((N & kBitsPerWordMask) || (N == 0)) // If there are any high bits to clear... (If we didn't have this check, then the code below would do the wrong thing when N == 32.
-			mWord[kWordCount - 1] &= ~(~static_cast<word_type>(0) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
+			mWord[kWordCount - 1] &= ~(static_cast<word_type>(~static_cast<word_type>(0)) << (N & kBitsPerWordMask)); // This clears any high unused bits. We need to do this so that shift operations proceed correctly.
 	}
 
 

include/EASTL/chrono.h

@@ -32,6 +32,7 @@
 	#define WIN32_LEAN_AND_MEAN
 	#endif
 	EA_DISABLE_ALL_VC_WARNINGS()
+	#undef NOMINMAX
 	#define NOMINMAX
 	#include <Windows.h>
 	// #ifdef min
@@ -44,11 +45,14 @@
 	#pragma warning(pop)
 #endif
 
-#ifdef EA_PLATFORM_MICROSOFT
+#if defined(EA_PLATFORM_MICROSOFT) && !defined(EA_PLATFORM_MINGW)
 	#include <thr/xtimec.h>
 #elif defined(EA_PLATFORM_APPLE)
 	#include <mach/mach_time.h>
-#elif defined(EA_PLATFORM_POSIX) // Posix means Linux, Unix, and Macintosh OSX, among others (including Linux-based mobile platforms).
+#elif defined(EA_PLATFORM_POSIX) || defined(EA_PLATFORM_MINGW) // Posix means Linux, Unix, and Macintosh OSX, among others (including Linux-based mobile platforms).
+	#if defined(EA_PLATFORM_MINGW)
+	#include <pthread_time.h>
+	#endif
 	#if (defined(CLOCK_REALTIME) || defined(CLOCK_MONOTONIC))
 		#include <time.h>
 		#include <errno.h>
@@ -534,7 +538,7 @@ namespace chrono
 
 	namespace Internal
 	{
-		#if defined EA_PLATFORM_MICROSOFT
+		#if defined(EA_PLATFORM_MICROSOFT) && !defined(EA_PLATFORM_MINGW)
 			#define EASTL_NS_PER_TICK _XTIME_NSECS_PER_TICK
 		#elif defined EA_PLATFORM_POSIX
 			#define EASTL_NS_PER_TICK _XTIME_NSECS_PER_TICK

include/EASTL/internal/config.h

@@ -1763,18 +1763,11 @@ typedef EASTL_SSIZE_T eastl_ssize_t; // Signed version of eastl_size_t. Concept
 /// EASTL_OPENSOURCE
 /// This is enabled when EASTL is building built in an "open source" mode.  Which is a mode that eliminates code
 /// dependencies on other technologies that have not been released publically.
-/// EASTL_OPENSOURCE = 0, is the default.  
+/// EASTL_OPENSOURCE = 0, is the default.
 /// EASTL_OPENSOURCE = 1, utilizes technologies that not publically available.
 /// 
 #ifndef EASTL_OPENSOURCE
 	#define EASTL_OPENSOURCE 0
 #endif
 
 #endif // Header include guard
-
-
-
-
-
-
-

include/EASTL/type_traits.h

@@ -783,7 +783,7 @@ namespace eastl
 	// shall name T&&; otherwise, type shall name T. [ Note: This rule reflects
 	// the semantics of reference collapsing (8.3.2). For example, when a type T
 	// names a type T1&, the type add_rvalue_reference<T>::type is not an
-	// rvalue reference. — end note ]
+	// rvalue reference. end note ]
 	//
 	// Rules (8.3.2 p6):
 	//      void + &&  -> void
@@ -865,7 +865,9 @@ namespace eastl
 	// 
 	///////////////////////////////////////////////////////////////////////
 
-	#if defined(EA_COMPILER_NO_VARIADIC_TEMPLATES) || defined(EA_COMPILER_MSVC) // VS2013 fails to compile the variadic code below due to what looks like a deficiency in their handling of integral variadic template parameters.
+	// VS2013 fails to compile the variadic code below due to what looks like a deficiency in their handling of integral variadic template parameters.
+	// Also mingw's clang and gcc fail to compile the code on windows.
+	#if defined(EA_COMPILER_NO_VARIADIC_TEMPLATES) || defined(EA_COMPILER_MSVC) || (defined(EA_PLATFORM_MINGW) && (defined(EA_COMPILER_CLANG) || defined(EA_COMPILER_GNUC)))
 		// We support only two parameters.
 
 		#define EASTL_TYPE_TRAIT_static_min_CONFORMANCE 0
@@ -894,7 +896,6 @@ namespace eastl
 		struct static_min<I0, I1, IN...>
 			{ static const size_t value = ((I0 <= I1) ? static_min<I0, IN...>::value : static_min<I1, IN...>::value); };
 
-
 		template <size_t I0, size_t ...IN>
 		struct static_max;
 
@@ -921,24 +922,3 @@ namespace eastl
 
 
 #endif // Header include guard
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

test/CMakeLists.txt

@@ -19,21 +19,27 @@ include_directories(source)
 #-------------------------------------------------------------------------------------------
 set(CMAKE_CXX_STANDARD 11)
 
-if(UNIX)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-pointer-bool-conversion")
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
 endif()
 
 #-------------------------------------------------------------------------------------------
 # Source files
 #-------------------------------------------------------------------------------------------
-file(GLOB EASTLTEST_SOURCES "source/*.cpp")
+file(GLOB EASTLTEST_SOURCES "source/*.cpp" "source/*.inl" "source/*.h")
 set(SOURCES ${EASTLTEST_SOURCES})
 
 #-------------------------------------------------------------------------------------------
 # Defines 
 #-------------------------------------------------------------------------------------------
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-add_definitions(-DEASTL_OPENSOURCE)
+add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+add_definitions(-DEASTL_OPENSOURCE=1)
 add_definitions(-D_CHAR16T)
 add_definitions(-DEASTL_THREAD_SUPPORT_AVAILABLE=0)
 
@@ -42,10 +48,13 @@ add_definitions(-DEASTL_THREAD_SUPPORT_AVAILABLE=0)
 #-------------------------------------------------------------------------------------------
 add_executable(EASTLTest ${SOURCES})
 
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+
 set(EASTLTest_Libraries
     EASTL
     EATest)
-target_link_libraries(EASTLTest ${EASTLTest_Libraries})
+target_link_libraries(EASTLTest ${EASTLTest_Libraries} Threads::Threads)
 
 #-------------------------------------------------------------------------------------------
 # Run Unit tests and verify the results. 

test/packages/EABase/include/Common/EABase/eahave.h

@@ -559,10 +559,10 @@
 #endif
 
 #if !defined(EA_HAVE_ISNAN) && !defined(EA_NO_HAVE_ISNAN)
-	#if defined(EA_PLATFORM_MICROSOFT)
+	#if defined(EA_PLATFORM_MICROSOFT) && !defined(EA_COMPILER_CLANG)
 		#define EA_HAVE_ISNAN(x)  _isnan(x)          /* declared in <math.h> */
 		#define EA_HAVE_ISINF(x)  !_finite(x)
-	#elif defined(EA_PLATFORM_APPLE)
+	#elif defined(EA_PLATFORM_APPLE) || (defined(EA_PLATFORM_MICROSOFT) && defined(EA_COMPILER_CLANG))
 		#define EA_HAVE_ISNAN(x)  std::isnan(x)      /* declared in <cmath> */
 		#define EA_HAVE_ISINF(x)  std::isinf(x)
 	#elif defined(EA_PLATFORM_ANDROID)

test/packages/EAMain/CMakeLists.txt

@@ -9,11 +9,6 @@ project(EAMain CXX)
 #-------------------------------------------------------------------------------------------
 add_library(EAMain INTERFACE)
 
-#-------------------------------------------------------------------------------------------
-# Compiler Flags
-#-------------------------------------------------------------------------------------------
-set(CMAKE_CXX_STANDARD 11)
-
 #-------------------------------------------------------------------------------------------
 # Source files
 #-------------------------------------------------------------------------------------------