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 2016/10/25 13:47:08 UTC
svn commit: r1766532 - in /openoffice/branches/AOO414: ./
main/stlport/systemstl/functional
Author: arielch
Date: Tue Oct 25 13:47:08 2016
New Revision: 1766532
URL: http://svn.apache.org/viewvc?rev=1766532&view=rev
Log:
i123947 - fix stlport emulation wrappers when compiling in C++11 mode
Modified:
openoffice/branches/AOO414/ (props changed)
openoffice/branches/AOO414/main/stlport/systemstl/functional
Propchange: openoffice/branches/AOO414/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 25 13:47:08 2016
@@ -2,5 +2,5 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1723875,1729921,1730154,1760461,1766467
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302,1647713,1652476,1654282,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1723875,1729921,1730154,1760461,1766467,176
6530
/openoffice/trunk/main:1705369
Modified: openoffice/branches/AOO414/main/stlport/systemstl/functional
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO414/main/stlport/systemstl/functional?rev=1766532&r1=1766531&r2=1766532&view=diff
==============================================================================
--- openoffice/branches/AOO414/main/stlport/systemstl/functional (original)
+++ openoffice/branches/AOO414/main/stlport/systemstl/functional Tue Oct 25 13:47:08 2016
@@ -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>