diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-08-02 10:16:40 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-08-07 15:21:07 +0200 |
| commit | 7c54bf9f6a4d6d162b3af587612e6c65eaee9831 (patch) | |
| tree | 30787296c9091b3f431e878e73636720d4759bc8 | |
| parent | fdo#46020: fixed missing footnote docx/doc/rtf export (diff) | |
| download | core-7c54bf9f6a4d6d162b3af587612e6c65eaee9831.tar.gz core-7c54bf9f6a4d6d162b3af587612e6c65eaee9831.zip | |
Fix windows build where min and max are macros
Change-Id: I59186db4003564b0b9c202456b7fdf91eaa67751
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
Signed-off-by: Andras Timar <atimar@suse.com>
| -rw-r--r-- | comphelper/inc/comphelper/newarray.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/inc/comphelper/newarray.hxx b/comphelper/inc/comphelper/newarray.hxx index 28d2846b98fc..6565c1707dbe 100644 --- a/comphelper/inc/comphelper/newarray.hxx +++ b/comphelper/inc/comphelper/newarray.hxx @@ -37,7 +37,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]; @@ -46,7 +46,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]; |