You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/05/27 17:46:36 UTC
svn commit: r1486646 - in /openoffice/trunk/main: chart2/source/tools/InternalData.cxx comphelper/source/misc/numberedcollection.cxx connectivity/source/commontools/TSkipDeletedSet.cxx connectivity/source/drivers/ado/AColumns.cxx sal/osl/all/debugbase.cxx

Author: hdu
Date: Mon May 27 15:46:35 2013
New Revision: 1486646

URL: http://svn.apache.org/r1486646
Log:
#i122208# include <algorithm> explicitly if functions from <algorithm> are used
    
most STLs include relevant parts of it indirectly, but
one can not depend on it (seen with MSVC's tr1 headers)

Modified:
    openoffice/trunk/main/chart2/source/tools/InternalData.cxx
    openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx
    openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx
    openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx
    openoffice/trunk/main/sal/osl/all/debugbase.cxx

Modified: openoffice/trunk/main/chart2/source/tools/InternalData.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/tools/InternalData.cxx?rev=1486646&r1=1486645&r2=1486646&view=diff
==============================================================================
--- openoffice/trunk/main/chart2/source/tools/InternalData.cxx (original)
+++ openoffice/trunk/main/chart2/source/tools/InternalData.cxx Mon May 27 15:46:35 2013
@@ -30,6 +30,7 @@
 #include "macros.hxx"
 
 #include <rtl/math.hxx>
+#include <algorithm>
 
 using ::com::sun::star::uno::Sequence;
 using ::rtl::OUString;

Modified: openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx?rev=1486646&r1=1486645&r2=1486646&view=diff
==============================================================================
--- openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx (original)
+++ openoffice/trunk/main/comphelper/source/misc/numberedcollection.cxx Mon May 27 15:46:35 2013
@@ -25,6 +25,7 @@
 #include "precompiled_comphelper.hxx"
 
 #include <comphelper/numberedcollection.hxx>
+#include <algorithm>
 
 //_______________________________________________
 // includes

Modified: openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx?rev=1486646&r1=1486645&r2=1486646&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx (original)
+++ openoffice/trunk/main/connectivity/source/commontools/TSkipDeletedSet.cxx Mon May 27 15:46:35 2013
@@ -26,6 +26,7 @@
 #include "TSkipDeletedSet.hxx"
 #include <osl/diagnose.h>
 #include <rtl/logfile.hxx>
+#include <algorithm>
 
 using namespace connectivity;
 // -----------------------------------------------------------------------------

Modified: openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx?rev=1486646&r1=1486645&r2=1486646&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx (original)
+++ openoffice/trunk/main/connectivity/source/drivers/ado/AColumns.cxx Mon May 27 15:46:35 2013
@@ -34,9 +34,7 @@
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#ifdef __MINGW32__
 #include <algorithm>
-#endif
 #include "resource/ado_res.hrc"
 
 using namespace connectivity::ado;

Modified: openoffice/trunk/main/sal/osl/all/debugbase.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/all/debugbase.cxx?rev=1486646&r1=1486645&r2=1486646&view=diff
==============================================================================
--- openoffice/trunk/main/sal/osl/all/debugbase.cxx (original)
+++ openoffice/trunk/main/sal/osl/all/debugbase.cxx Mon May 27 15:46:35 2013
@@ -31,6 +31,7 @@
 #include "osl/diagnose.hxx"
 #include "boost/bind.hpp"
 #include <vector>
+#include <algorithm>
 
 // define own ones, independent of OSL_DEBUG_LEVEL:
 #define DEBUGBASE_ENSURE_(c, f, l, m) \