Tag: cws_dev300_obo30 User: obo Date: 2008-05-29 09:27:14+0000 Modified: dba/connectivity/source/drivers/ado/AStatement.cxx
Log: #i90100# build breaks with ENABLE_PCH set File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: AStatement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AStatement.cxx?r1=1.28&r2=1.28.30.1 Delta lines: +6 -9 ------------------- --- AStatement.cxx 2008-04-10 08:24:22+0000 1.28 +++ AStatement.cxx 2008-05-29 09:27:12+0000 1.28.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AStatement.cxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.28.30.1 $ * * 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 @@ ::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 @@ return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ----------------------------------------------------------------------------- - --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
