diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-03 18:27:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-03 18:36:55 +0100 |
| commit | b2371492dfd5c8003f89ed8acf3dbc690d6af8d0 (patch) | |
| tree | 876a32c415fa06d41a51a2a4a9cc16b1e97bdf76 /vcl/unx | |
| parent | 768ea2924680fc4beb75a782cb0faf26695fee53 (diff) | |
Use cstdlib std::abs instead of stdlib.h abs
...because the latter lacks the abs(long) overload in some popular environments,
cf. <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60401> "stdlib.h does not
provide abs(long) overload."
Similarly, stdlib.h lacks the abs(float), abs(double), abs(long double)
overloads compared to cmath there, whose use was apparently intended in
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx. Rewrote that to use
CPPUNIT_ASSERT_DOUBLES_EQUAL instead, which revealed that the comparisons need
rather large deltas of .1 resp. .2 (which the original code hid with an
implicit conversion to integral type, thus using an effective delta of 1).
Discovered with -Wabsolute-value ("absolute value function 'abs' given an
argument of type 'long' but has parameter of type 'int' which may cause
truncation of value") recently introduced on Clang trunk towards 3.5.
Change-Id: I4c41575ffdccb2944498b662bd3a53fd510cb0c0
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 4072e835cad6..0e5a3ce8ce39 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <cstdlib> #include "unx/saldisp.hxx" #include "unx/saldata.hxx" @@ -1246,7 +1249,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > it = m_aSelections.find( selection ); if( it != m_aSelections.end() && it->second->m_aTypes.getLength() && - abs( it->second->m_nLastTimestamp - time( NULL ) ) < 2 + std::abs( it->second->m_nLastTimestamp - time( NULL ) ) < 2 ) { rTypes = it->second->m_aTypes; |