diff options
| author | brainbreaker <gautamprajapati06@gmail.com> | 2017-07-13 09:43:23 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-18 10:14:39 +0200 |
| commit | e530689ef6ba79a26162670580ba28f9b09eb689 (patch) | |
| tree | 86d136f135951d709f2c95fd80c4e0fd2171740c /vcl | |
| parent | 6b0cace60b2ca1bd27132c77cd0cd7699386ede6 (diff) | |
Clean up android specific template functions defined in std namespace
Change-Id: I2094ee8eec00587f166d96723a02eb5957dbf79b
Reviewed-on: https://gerrit.libreoffice.org/39890
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/sgvspln.cxx | 11 | ||||
| -rw-r--r-- | vcl/source/gdi/CommonSalLayout.cxx | 12 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 11 |
3 files changed, 3 insertions, 31 deletions
diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index 7781849cda9d..6fa9da2c7916 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -24,16 +24,7 @@ #include <sgvspln.hxx> #include <cmath> -#if defined(ANDROID) -namespace std -{ -template<typename T> -T copysign(T x, T y) -{ - return ::copysign(x, y); -} -} -#endif +#include <android/compatibility.hxx> extern "C" { diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index cb4f3d3862cc..e826d38be1fe 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -27,17 +27,7 @@ #include <limits> #include <salgdi.hxx> #include <unicode/uchar.h> - -#if defined(ANDROID) -namespace std -{ -template<typename T> -T lround(T x) -{ - return ::lround(x); -} -} -#endif +#include <android/compatibility.hxx> static hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pUserData) { diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 3124725785d6..bb3ffa456377 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -24,6 +24,7 @@ #include <vcl/sysdata.hxx> #include <vcl/svapp.hxx> #include <vcl/fontcharmap.hxx> +#include <android/compatibility.hxx> #include "unx/printergfx.hxx" #include "unx/genpspgraphics.h" @@ -38,16 +39,6 @@ #include <cairo-ft.h> #include "CommonSalLayout.hxx" -#ifdef ANDROID -namespace std -{ -double fmax(double x, double y) -{ - return ::fmax(x, y); -} -} -#endif - namespace { typedef struct FT_FaceRec_* FT_Face; |