From a7859d08ab3f4c214e83d311a5db7aeed2f707b5 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 5 Mar 2014 13:07:31 +0100
Subject: Work around unfortunate libstdc++ interpretation of C++ cmath
 requirements

...that causes a call to std::abs with a short argument to effectively select
the double overload (via a template added with <http://gcc.gnu.org/git/
?p=gcc.git;a=commit;h=8c0edf5c2aad076cbc805299ed82845ae049f4f6>
"include/c_std/cmath (abs(_Tp)): Add"), see
<http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-toc.html#2192> "Validity and
return type of std::abs(0u) is unclear" for details.

The workaround is to use int instead of short arguments (and make sure the
integral overloads of std::abs from cstdlib are available).

Change-Id: If95363f9a54abb9cb1a57fd4828c4b91c12bc4be
---
 svl/source/numbers/zforfind.cxx | 2 +-
 svl/source/numbers/zforfind.hxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'svl')

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 6119ca2c3a8f..4bb4c18d27c2 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -19,7 +19,7 @@
 
 
 #include <ctype.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <float.h>
 #include <errno.h>
 #include <comphelper/string.hxx>
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 6e24040faa4f..5738ce60c5f6 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -104,7 +104,7 @@ private:
     static const sal_uInt8 nMatchedUsedAsReturn;     // 0x10
 
     int    nSign;                               // Sign of number
-    short  nMonth;                              // Month (1..x) if date
+    int    nMonth;                              // Month (1..x) if date
                                                 // negative => short format
     short  nMonthPos;                           // 1 = front, 2 = middle
                                                 // 3 = end
-- 
cgit v1.2.3