openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1554812 - in /openoffice/trunk/main/stlport/systemstl: hash_map hash_set slist
Date Thu, 02 Jan 2014 14:20:44 GMT
Author: hdu
Date: Thu Jan  2 14:20:44 2014
New Revision: 1554812

URL: http://svn.apache.org/r1554812
Log:
#i123947# fix stlport emulation wrappers when compiling in C++11 mode

When compiling in C++11 mode the system provided TR1 compliant headers are
already required to be available and to be in the std namespace. The wrappers
trying to map the TR1 containers into the std namespace too is problematic
them, so it must be avoided in C++11 mode. Having TR1 compliant headers
available directly also simplifies the stlport4 emulation considerably.

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

Modified: openoffice/trunk/main/stlport/systemstl/hash_map
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_map?rev=1554812&r1=1554811&r2=1554812&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/hash_map (original)
+++ openoffice/trunk/main/stlport/systemstl/hash_map Thu Jan  2 14:20:44 2014
@@ -25,6 +25,8 @@
 #ifdef HAVE_STL_INCLUDE_PATH
 	// TODO: use computed include file name
 	#include_next <unordered_map>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+	#include <unordered_map>
 #elif defined(_MSC_VER)
 	#include <../../VC/include/unordered_map>
 	#define STLP4_EMUBASE_NS ::std::tr1

Modified: openoffice/trunk/main/stlport/systemstl/hash_set
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/hash_set?rev=1554812&r1=1554811&r2=1554812&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/hash_set (original)
+++ openoffice/trunk/main/stlport/systemstl/hash_set Thu Jan  2 14:20:44 2014
@@ -25,6 +25,8 @@
 #ifdef HAVE_STL_INCLUDE_PATH
 	// TODO: use computed include file name
 	#include_next <unordered_set>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+	#include <unordered_set>
 #elif defined(_MSC_VER)
 	#include <../../VC/include/unordered_set>
 	#define STLP4_EMUBASE_NS ::std::tr1

Modified: openoffice/trunk/main/stlport/systemstl/slist
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/slist?rev=1554812&r1=1554811&r2=1554812&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/slist (original)
+++ openoffice/trunk/main/stlport/systemstl/slist Thu Jan  2 14:20:44 2014
@@ -25,6 +25,8 @@
 #ifdef HAVE_STL_INCLUDE_PATH
 	// TODO: use computed include file name
 	#include_next <forward_list>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+	#include <forward_list>
 #elif defined(_MSC_VER)
 	#include <../../VC/include/list>
 	#define STLP4_SLIST_WITH_LIST



Mime
View raw message