diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-05 13:07:31 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-05 17:45:18 +0100 |
| commit | a7859d08ab3f4c214e83d311a5db7aeed2f707b5 (patch) | |
| tree | 362a618b16d5709fe79ac43c7730212aa21f2e0a /svl | |
| parent | cf1878f5dcac82f61f696410faa685c7a2d795a8 (diff) | |
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
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zforfind.cxx | 2 | ||||
| -rw-r--r-- | svl/source/numbers/zforfind.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
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 |