3.07.01 release

electronicarts · Jan 30, 2018 · 166512d · 166512d
1 parent cc46050
commit 166512d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/include/EASTL/deque.h b/include/EASTL/deque.h
@@ -1528,6 +1528,7 @@ namespace eastl
 	template <typename T, typename Allocator, unsigned kDequeSubarraySize>
 	inline void deque<T, Allocator, kDequeSubarraySize>::shrink_to_fit()
 	{
+		return set_capacity(0);
 	}
 
 

diff --git a/include/EASTL/internal/config.h b/include/EASTL/internal/config.h
@@ -89,8 +89,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef EASTL_VERSION
-	#define EASTL_VERSION   "3.07.00"
-	#define EASTL_VERSION_N  30700
+	#define EASTL_VERSION   "3.07.01"
+	#define EASTL_VERSION_N  30701
 #endif
 
 

diff --git a/test/source/TestDeque.cpp b/test/source/TestDeque.cpp
@@ -1007,17 +1007,6 @@ int TestDeque()
 		const eastl::deque<int> constIntDeque5 = constIntDeque4;
 	}
 
-	{ // Regression to verify that shrink_to_fit works
-		eastl::deque<int> intDeque;
-		VERIFY(intDeque.size() == 0);
-
-		intDeque.push_back(42);
-		VERIFY(intDeque.size() == 1);
-
-		intDeque.shrink_to_fit();
-		VERIFY(intDeque.size() == 1);
-	}
-
 	return nErrorCount;
 }
 

diff --git a/test/source/TestString.inl b/test/source/TestString.inl
@@ -38,7 +38,7 @@ int TEST_STRING_NAME()
 			VERIFY(str.empty());
 		}
 
-		if(!is_same<typename StringType::value_type, char32_t>::value && (EA_PLATFORM_WORD_SIZE == 4))  // not even a single char32_t (plus null-terminator) can fit into the SSO buffer on 32-bit platforms
+		if(!(sizeof(typename StringType::value_type) >= 4) && (EA_PLATFORM_WORD_SIZE == 4))  // not even a single char32_t (plus null-terminator) can fit into the SSO buffer on 32-bit platforms
 		{
 			auto* pLiteral = LITERAL("a");
 			SSOString str(pLiteral);