diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 14:59:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 14:59:34 +0000 |
| commit | ba6861f759ada440e8b1e6b01bad9ef2440be5fa (patch) | |
| tree | 07711ce98c68a40f66bbebf886aaddcbc58b0474 /connectivity | |
| parent | 87523929cf9199d2175e31cc37a80122ee78331f (diff) | |
INTEGRATION: CWS obo30 (1.28.30); FILE MERGED
2008/06/20 09:52:50 obo 1.28.30.2: RESYNC: (1.28-1.29); FILE MERGED
2008/05/29 09:27:12 obo 1.28.30.1: #i90100# build breaks with ENABLE_PCH set
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/ado/AStatement.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 887bfec98004..632020824c2c 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AStatement.cxx,v $ - * $Revision: 1.29 $ + * $Revision: 1.30 $ * * This file is part of OpenOffice.org. * @@ -44,6 +44,8 @@ #include "connectivity/dbexception.hxx" #include <comphelper/types.hxx> +#undef max + #include <algorithm> using namespace ::comphelper; @@ -229,11 +231,7 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType) ::std::vector<OTypeInfo>::const_iterator aIter = ::std::find(m_aTypeInfo.begin(),m_aTypeInfo.end(),aInfo); for(;aIter != m_aTypeInfo.end();++aIter) { -#if (_MSC_VER < 1300) - prec = std::max(prec,(*aIter).nPrecision); -#else - prec = max(prec,(*aIter).nPrecision); -#endif + prec = ::std::max(prec,(*aIter).nPrecision); } } @@ -844,4 +842,3 @@ void SAL_CALL OStatement::release() throw() return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ----------------------------------------------------------------------------- - |