[Libreoffice-commits] .: sal/cppunittester

Fridrich Strba fridrich at kemper.freedesktop.org
Wed Mar 23 10:06:33 PDT 2011


 sal/cppunittester/cppunittester.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 147443a7bdad620e7d2800831aa19dca0468900e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 23 18:06:12 2011 +0100

    Work around Visual Studio lameness with "max"

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index dd3d724..96d2347 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -79,8 +79,8 @@ std::string convertLazy(rtl::OUString const & s16) {
     return std::string(
         s8.getStr(),
         ((static_cast< sal_uInt32 >(s8.getLength())
-          > std::numeric_limits< std::string::size_type >::max())
-         ? std::numeric_limits< std::string::size_type >::max()
+          > (std::numeric_limits< std::string::size_type >::max)())
+         ? (std::numeric_limits< std::string::size_type >::max)()
          : static_cast< std::string::size_type >(s8.getLength())));
 }
 


More information about the Libreoffice-commits mailing list