diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-10-25 21:02:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-28 18:09:02 +0000 |
| commit | 9e716494a8f7a1ffbfd519ffc388df0226f4046f (patch) | |
| tree | 99e4fdb269c6d0ea2d8082b88fabc59713062b28 /connectivity | |
| parent | 1d1bab408421030cb260d67a519d478db87bdff5 (diff) | |
fix some VS 2010 specific issues
Change-Id: Iae27a96c1e2ed72d2744fcbe100d6ada7dc41c82
Reviewed-on: https://gerrit.libreoffice.org/914
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/TSortIndex.cxx | 3 | ||||
| -rw-r--r-- | connectivity/source/commontools/TTableHelper.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 1 | ||||
| -rw-r--r-- | connectivity/source/manager/mdrivermanager.cxx | 1 | ||||
| -rw-r--r-- | connectivity/source/parse/sqliterator.cxx | 3 |
5 files changed, 9 insertions, 1 deletions
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index a0fc73823167..a9d5bc5028b7 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -19,6 +19,7 @@ #include "TSortIndex.hxx" #include <algorithm> +#include <iterator> #include <o3tl/compat_functional.hxx> @@ -107,7 +108,7 @@ void OSortIndex::AddKeyValue(OKeyValue * pKeyValue) OSL_ENSURE(pKeyValue,"Can not be null here!"); if(m_bFrozen) { - m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),NULL)); + m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),(OKeyValue *)NULL)); delete pKeyValue; } else diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index cec9e48009eb..6a5ad878f004 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -36,6 +36,8 @@ #include <o3tl/compat_functional.hxx> +#include <iterator> + using namespace ::comphelper; using namespace connectivity; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 2afd00192482..6c758f88ebdd 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -81,6 +81,7 @@ #include "connectivity/OSubComponent.hxx" #include <algorithm> +#include <iterator> using namespace ::comphelper; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index 743d38a35e8d..7f2d8fb30c2c 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -35,6 +35,7 @@ #include <osl/diagnose.h> #include <algorithm> +#include <iterator> #include <o3tl/compat_functional.hxx> diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index f30aca2fe41f..5ee583e15605 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -40,6 +40,9 @@ #include "diagnose_ex.h" #include <rtl/logfile.hxx> + +#include <iterator> + using namespace ::comphelper; using namespace ::connectivity; using namespace ::connectivity::sdbcx; |