Merge branch 'master' into 3.05.09

electronicarts · Oct 16, 2017 · fce4c9a · fce4c9a
2 parents 2605ac3 + a593183
commit fce4c9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,7 @@ addons:
       - gcc-4.8
       - g++-4.8
       - clang
+      - libc++-dev
 
 matrix:
     include:

diff --git a/include/EASTL/internal/config.h b/include/EASTL/internal/config.h
@@ -1808,7 +1808,7 @@ typedef EASTL_SSIZE_T eastl_ssize_t; // Signed version of eastl_size_t. Concept
 		// reserved for standard libary usage.
 		EA_DISABLE_CLANG_WARNING(-Wuser-defined-literals)
 		EA_DISABLE_CLANG_WARNING(-Wreserved-user-defined-literal)
-		EA_DISABLE_GCC_WARNING(-Wno-literal-suffix)
+		EA_DISABLE_GCC_WARNING(-Wliteral-suffix)
 		#ifdef _MSC_VER
 			#pragma warning(disable: 4455) // disable warning C4455: literal suffix identifiers that do not start with an underscore are reserved
 		#endif