diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-09-16 08:09:07 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-09-16 08:56:53 +0200 |
| commit | 1b5479c6a5dda39e0a970cbfd112e88fcc3b8883 (patch) | |
| tree | 8438b602cc63957c835ecfc24df05ba0c78b5558 /connectivity | |
| parent | 34fe0d32505f64fdef20828c26547cc7f8453212 (diff) | |
fix build on 32bit SQLWCHAR
Change-Id: I9a3e30496c7cfaca4b6a156930421b4e4246fff6
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/odbc/OTools.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index 4d386e70cabe..27c35a734146 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -25,6 +25,9 @@ #include "diagnose_ex.h" #include <rtl/ustrbuf.hxx> #include <boost/static_assert.hpp> +#include <boost/typeof/typeof.hpp> +#include <boost/mpl/bool.hpp> +#include <boost/mpl/if.hpp> #include <string.h> @@ -459,7 +462,7 @@ OUString OTools::getStringValue(OConnection* _pConnection, if (sizeof (SQLWCHAR) == 2) { - aData.append(waCharArray, nReadChars); + aData.append(reinterpret_cast< boost::mpl::if_< boost::mpl::bool_< sizeof(SQLWCHAR) == 2 >, BOOST_TYPEOF(&waCharArray[0]), sal_Unicode* >::type >(waCharArray), nReadChars); } else { |