3.05.00 release

electronicarts · Dec 7, 2016 · 9dfa6a2 · 9dfa6a2
1 parent 201e4c2
commit 9dfa6a2
Show file tree

Hide file tree

Showing 20 changed files with 1,582 additions and 396 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ eastl_build_out
 build_bench
 bench.bat
 build.bat
+.p4config
 
 ## CMake generated files
 CMakeCache.txt

diff --git a/include/EASTL/any.h b/include/EASTL/any.h
@@ -330,8 +330,10 @@ namespace eastl
 		storage_handler_ptr m_handler;
 
 	public:
-		// TODO(rparolin):  renable constexpr
-		// EA_CONSTEXPR 
+			#ifndef EA_COMPILER_GNUC
+				// TODO(rparolin):  renable constexpr for GCC
+				EA_CONSTEXPR 
+			#endif
 			any() EA_NOEXCEPT 
 			: m_storage(), m_handler(nullptr) {}
 

diff --git a/include/EASTL/chrono.h b/include/EASTL/chrono.h
@@ -553,7 +553,7 @@ namespace chrono
 		///////////////////////////////////////////////////////////////////////////////
 		// Internal::GetTicks 
 		///////////////////////////////////////////////////////////////////////////////
-		uint64_t GetTicks()
+		inline uint64_t GetTicks()
 		{
 		#if defined EA_PLATFORM_MICROSOFT
 			uint64_t t;

diff --git a/include/EASTL/core_allocator_adapter.h b/include/EASTL/core_allocator_adapter.h
@@ -255,10 +255,13 @@ namespace EA
 		template<class AllocatorType>
 		inline CoreAllocatorAdapter<AllocatorType>& CoreAllocatorAdapter<AllocatorType>::operator=(const CoreAllocatorAdapter& x)
 		{
-			// In order to be consistent with EASTL's allocator implementation, 
-			// we don't copy the name from the source object.
 			mpCoreAllocator = x.mpCoreAllocator;
 			mnFlags         = x.mnFlags;
+
+			#if EASTL_NAME_ENABLED
+				mpName = x.mpName;
+			#endif
+
 			return *this;
 		}