Roberto Parolin 6 years ago
parent
commit
edbafca82e

+ 1 - 1
.gitignore

@@ -1,2 +1,2 @@
 tags
-
+.p4config

+ 1 - 1
.p4ignore

@@ -1,4 +1,4 @@
 tags
-.p4ignore
 
+.p4config
 /.git/

+ 9 - 9
include/Common/EABase/config/eacompilertraits.h

@@ -1550,7 +1550,7 @@
 			#else
 				#define EA_SSE 0
 			#endif
-		#elif (defined(EA_SSE3) && EA_SSE3) || defined EA_PLATFORM_XBOXONE
+		#elif (defined(EA_SSE3) && EA_SSE3) || defined EA_PLATFORM_XBOXONE || defined CS_UNDEFINED_STRING
 			#define EA_SSE 3
 		#elif defined(EA_SSE2) && EA_SSE2
 			#define EA_SSE 2
@@ -1589,28 +1589,28 @@
 		#endif
 	#endif
 	#ifndef EA_SSSE3
-		#if defined __SSSE3__ || defined EA_PLATFORM_XBOXONE
+		#if defined __SSSE3__ || defined EA_PLATFORM_XBOXONE || defined CS_UNDEFINED_STRING
 			#define EA_SSSE3 1
 		#else
 			#define EA_SSSE3 0
 		#endif
 	#endif
 	#ifndef EA_SSE4_1
-		#if defined __SSE4_1__ || defined EA_PLATFORM_XBOXONE
+		#if defined __SSE4_1__ || defined EA_PLATFORM_XBOXONE || defined CS_UNDEFINED_STRING
 			#define EA_SSE4_1 1
 		#else
 			#define EA_SSE4_1 0
 		#endif
 	#endif
 	#ifndef EA_SSE4_2
-		#if defined __SSE4_2__ || defined EA_PLATFORM_XBOXONE
+		#if defined __SSE4_2__ || defined EA_PLATFORM_XBOXONE || defined CS_UNDEFINED_STRING
 			#define EA_SSE4_2 1
 		#else
 			#define EA_SSE4_2 0
 		#endif
 	#endif
 	#ifndef EA_SSE4A
-		#if defined __SSE4A__ || defined EA_PLATFORM_XBOXONE
+		#if defined __SSE4A__ || defined EA_PLATFORM_XBOXONE || defined CS_UNDEFINED_STRING
 			#define EA_SSE4A 1
 		#else
 			#define EA_SSE4A 0
@@ -1628,7 +1628,7 @@
 	#ifndef EA_AVX
 		#if defined __AVX2__
 			#define EA_AVX 2
-		#elif defined __AVX__ || defined EA_PLATFORM_XBOXONE
+		#elif defined __AVX__ || defined EA_PLATFORM_XBOXONE || defined CS_UNDEFINED_STRING
 			#define EA_AVX 1
 		#else
 			#define EA_AVX 0
@@ -1645,7 +1645,7 @@
 	// EA_FP16C may be used to determine the existence of float <-> half conversion operations on an x86 CPU.
 	// (For example to determine if _mm_cvtph_ps or _mm_cvtps_ph could be used.)
 	#ifndef EA_FP16C
-		#if defined __F16C__ || defined EA_PLATFORM_XBOXONE
+		#if defined __F16C__ || defined EA_PLATFORM_XBOXONE || defined CS_UNDEFINED_STRING
 			#define EA_FP16C 1
 		#else
 			#define EA_FP16C 0
@@ -1668,7 +1668,7 @@
 	// EA_ABM may be used to determine if Advanced Bit Manipulation sets are available for the target architecture (POPCNT, LZCNT)
 	// 
 	#ifndef EA_ABM
-		#if defined(__ABM__) || defined(EA_PLATFORM_XBOXONE) || defined(EA_PLATFORM_SONY)
+		#if defined(__ABM__) || defined(EA_PLATFORM_XBOXONE) || defined(EA_PLATFORM_SONY) || defined(CS_UNDEFINED_STRING)
 			#define EA_ABM 1
 		#else
 			#define EA_ABM 0
@@ -1697,7 +1697,7 @@
 	#ifndef EA_BMI
 		#if defined(__BMI2__)
 			#define EA_BMI 2
-		#elif defined(__BMI__) || defined(EA_PLATFORM_XBOXONE)
+		#elif defined(__BMI__) || defined(EA_PLATFORM_XBOXONE) || defined(CS_UNDEFINED_STRING)
 			#define EA_BMI 1
 		#else
 			#define EA_BMI 0

+ 0 - 2
include/Common/EABase/config/eaplatform.h

@@ -224,8 +224,6 @@
 	#if EA_WINAPI_FAMILY_PARTITION(EA_WINAPI_PARTITION_TV_TITLE)
 		#define EA_PLATFORM_XBOXONE_XDK 	1
 	#endif
-
-// Larrabee                                           // This part to be removed once __LRB__ is supported by the Larrabee compiler in 2009.
 #elif defined(EA_PLATFORM_LRB) || defined(__LRB__) || (defined(__EDG__) && defined(__ICC) && defined(__x86_64__))
 	#undef  EA_PLATFORM_LRB
 	#define EA_PLATFORM_LRB         1

+ 0 - 8
include/Common/EABase/int128.h

@@ -111,20 +111,12 @@ protected:
 
 	EA_CONSTEXPR uint64_t Low() const
 	{
-	#ifdef EA_SYSTEM_BIG_ENDIAN
 		return mPart0;
-	#else
-		return mPart1;
-	#endif
 	}
 
 	EA_CONSTEXPR uint64_t High() const
 	{
-	#ifdef EA_SYSTEM_BIG_ENDIAN
 		return mPart1;
-	#else
-		return mPart0;
-	#endif
 	}
 
 protected:

+ 2 - 2
include/Common/EABase/version.h

@@ -29,8 +29,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef EABASE_VERSION
-    #define EABASE_VERSION "2.09.09"
-    #define EABASE_VERSION_N 20909
+    #define EABASE_VERSION "2.09.10"
+    #define EABASE_VERSION_N 20910
 #endif
 
 #endif

+ 4 - 0
test/source/TestEABase.cpp

@@ -2316,7 +2316,11 @@ int TestEACompilerTraits()
 		EA_ALIGNED(int, j[3], ALIGNMENT_AMOUNT_16);
 		EA_ALIGNED(int, k[3], ALIGNMENT_AMOUNT_16) = { 1, 2, 3 };
 		struct EA_ALIGN(8) L { int x; int y; };
+
+		EA_DISABLE_VC_WARNING(4359)
 		EA_ALIGN(ALIGNMENT_AMOUNT_32) struct X { int x; int y; } m;
+		EA_RESTORE_VC_WARNING()
+
 	  //int N[3] EA_PACKED; // Some compilers (e.g. GCC) don't support this or ignore this and generate a warning.
 		struct P { int x EA_PACKED; int y EA_PACKED; };
 		struct Q { int x; int y; } EA_PACKED;