openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1574415 - /openoffice/trunk/main/stlport/systemstl/hash_map
Date Wed, 05 Mar 2014 10:51:54 GMT
Author: af
Date: Wed Mar  5 10:51:54 2014
New Revision: 1574415

URL: http://svn.apache.org/r1574415
Log:
124361: Avoid MSVC warning 4555 while including unordered_map.

Modified:
    openoffice/trunk/main/stlport/systemstl/hash_map

Modified: openoffice/trunk/main/stlport/systemstl/hash_map
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_map?rev=1574415&r1=1574414&r2=1574415&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/hash_map (original)
+++ openoffice/trunk/main/stlport/systemstl/hash_map Wed Mar  5 10:51:54 2014
@@ -23,16 +23,19 @@
 #define SYSTEM_STL_HASHMAP
 
 #ifdef HAVE_STL_INCLUDE_PATH
-	// TODO: use computed include file name
-	#include_next <unordered_map>
+    // TODO: use computed include file name
+    #include_next <unordered_map>
 #elif defined(__cplusplus) && (__cplusplus >= 201103L)
-	#include <unordered_map>
+    #include <unordered_map>
 #elif defined(_MSC_VER)
-	#include <../../VC/include/unordered_map>
-	#define STLP4_EMUBASE_NS ::std::tr1
+    #pragma warning(push)
+    #pragma warning(disable:4555)
+    #include <../../VC/include/unordered_map>
+    #pragma warning(pop)
+    #define STLP4_EMUBASE_NS ::std::tr1
 #else // fall back to boost/tr1
-	#include <boost/tr1/tr1/unordered_map>
-	#define STLP4_EMUBASE_NS ::boost
+    #include <boost/tr1/tr1/unordered_map>
+    #define STLP4_EMUBASE_NS ::boost
 #endif
 
 



Mime
View raw message