[Libreoffice-commits] core.git: Branch 'aoo/trunk' - stlport/systemstl

[Ariel Constenla-Haile]

 stlport/systemstl/functional |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4a5305d9474698cf29d31ebe4f19ab9b079ca4b9
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Tue Oct 25 13:39:30 2016 +0000

    i123947 - fix stlport emulation wrappers when compiling in C++11 mode

diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
index 44c4429..5915ca1 100644
--- a/stlport/systemstl/functional
+++ b/stlport/systemstl/functional
@@ -32,6 +32,8 @@
 	// note: VS2008SP1 has known problems after a security update (KB971092,KB974479,KB974223)
 	namespace std{ template<class _T> void _Swap_adl(_T& l, _T& r) {swap(l,r);} }
 #endif	
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #include_next <functional>
 #else // fall back to boost/tr1
 	#include <boost/tr1/tr1/functional>
 	#include <boost/functional/hash.hpp>