User: kz Date: 2008-06-24 15:59:38+0000 Modified: dba/connectivity/source/drivers/ado/AStatement.cxx
Log: 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 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.29&r2=1.30 Delta lines: +4 -7 ------------------- --- AStatement.cxx 2008-06-06 13:19:59+0000 1.29 +++ AStatement.cxx 2008-06-24 15:59:34+0000 1.30 @@ -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]
