summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-08-02 10:16:40 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-08-02 10:23:15 +0200
commitcf2bdd65945d2a02af44db535cf1964d4d09ae20 (patch)
treea3cd9f3157bedef9d2c4da4d49ed2f9fde4e0ce3
parentc87e4eb383975b7c16bd696e27750bc711555ae5 (diff)
Fix windows build where min and max are macros
Change-Id: I59186db4003564b0b9c202456b7fdf91eaa67751
-rw-r--r--comphelper/inc/comphelper/newarray.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/inc/comphelper/newarray.hxx b/comphelper/inc/comphelper/newarray.hxx
index d7ce756d2d48..b64095ae8ff4 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];