You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2019/10/27 07:12:07 UTC
[openoffice] 05/05: i123947 - fix stlport emulation when compiling
in C++11 mode
This is an automated email from the ASF dual-hosted git repository.
arielch pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f322e9922b6852cb8bf6187b8219a3d0bba4f778
Author: Ariel Constenla-Haile <ar...@apache.org>
AuthorDate: Sun Oct 27 03:51:33 2019 -0300
i123947 - fix stlport emulation when compiling in C++11 mode
(cherry picked from commit 1828d080320011efd486c973e80e3eec3ad241f7)
---
main/stlport/systemstl/list | 12 ++++++++----
main/stlport/systemstl/map | 2 ++
main/stlport/systemstl/numeric | 2 ++
main/stlport/systemstl/set | 2 ++
main/stlport/systemstl/vector | 2 ++
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/main/stlport/systemstl/list b/main/stlport/systemstl/list
index 283880b..6c66137 100644
--- a/main/stlport/systemstl/list
+++ b/main/stlport/systemstl/list
@@ -26,10 +26,14 @@
// TODO: use computed include file name
#include_next <list>
#elif defined(_MSC_VER)
- #include <../../VC/include/list>
- // MSVC's list would cause a lot of expression-result-unused warnings
- // unless it is compiled in iterator-debugging mode. Silence this noise
- #pragma warning(disable:4555)
+ // MSVC's list would cause a lot of expression-result-unused warnings
+ // unless it is compiled in iterator-debugging mode. Silence this noise temporarily.
+ #pragma warning(push)
+ #pragma warning(disable:4555)
+ #include <../../VC/include/list>
+ #pragma warning(pop)
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <list>
#else // fall back to boost/tr1
#include <boost/tr1/tr1/list>
#endif
diff --git a/main/stlport/systemstl/map b/main/stlport/systemstl/map
index 13f783b..ec1c3db 100644
--- a/main/stlport/systemstl/map
+++ b/main/stlport/systemstl/map
@@ -25,6 +25,8 @@
#ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name
#include_next <map>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <map>
#elif defined(_MSC_VER)
#include <../../VC/include/map>
#else // fall back to boost/tr1
diff --git a/main/stlport/systemstl/numeric b/main/stlport/systemstl/numeric
index 975612b..5bd6b90 100644
--- a/main/stlport/systemstl/numeric
+++ b/main/stlport/systemstl/numeric
@@ -25,6 +25,8 @@
#ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name
#include_next <numeric>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <numeric>
#elif defined(_MSC_VER)
#include <../../VC/include/numeric>
#else // fall back to boost/tr1
diff --git a/main/stlport/systemstl/set b/main/stlport/systemstl/set
index 2d99053..674cab0 100644
--- a/main/stlport/systemstl/set
+++ b/main/stlport/systemstl/set
@@ -27,6 +27,8 @@
// TODO: use computed include file name
#include "utility"
#include_next <set>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <set>
#elif defined(_MSC_VER)
#include <../../VC/include/set>
#else // fall back to boost/tr1
diff --git a/main/stlport/systemstl/vector b/main/stlport/systemstl/vector
index 8b4e86f..3275372 100644
--- a/main/stlport/systemstl/vector
+++ b/main/stlport/systemstl/vector
@@ -25,6 +25,8 @@
#ifdef HAVE_STL_INCLUDE_PATH
// TODO: use computed include file name
#include_next <vector>
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+ #include_next <vector>
#elif defined(_MSC_VER)
#include <../../VC/include/vector>
#else // fall back to boost/tr1