[Libreoffice-commits] .: comphelper/inc

[Fridrich Strba]

 comphelper/inc/comphelper/newarray.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cf2bdd65945d2a02af44db535cf1964d4d09ae20
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Aug 2 10:16:40 2012 +0200

    Fix windows build where min and max are macros
    
    Change-Id: I59186db4003564b0b9c202456b7fdf91eaa67751

diff --git a/comphelper/inc/comphelper/newarray.hxx b/comphelper/inc/comphelper/newarray.hxx
index d7ce756..b64095a 100644
--- a/comphelper/inc/comphelper/newarray.hxx
+++ b/comphelper/inc/comphelper/newarray.hxx
@@ -29,7 +29,7 @@ namespace comphelper {
 template<typename T> T *
 newArray_null(size_t const n) throw()
 {
-    if ((::std::numeric_limits<size_t>::max() / sizeof(T)) <= n) {
+    if (((::std::numeric_limits<size_t>::max)() / sizeof(T)) <= n) {
         return 0;
     }
     return new (::std::nothrow) T[n];
@@ -38,7 +38,7 @@ newArray_null(size_t const n) throw()
 template<typename T> T *
 newArray_ex(size_t const n)
 {
-    if ((::std::numeric_limits<size_t>::max() / sizeof(T)) <= n) {
+    if (((::std::numeric_limits<size_t>::max)() / sizeof(T)) <= n) {
         throw ::std::bad_alloc();
     }
     return new T[n];