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 /drawinglayer/source | |
| 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 'drawinglayer/source')
| -rw-r--r-- | drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 11 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 12 |
2 files changed, 2 insertions, 21 deletions
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index ce0ed78e3fbc..84ea9fff10ca 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -26,21 +26,12 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <svtools/borderhelper.hxx> #include <editeng/borderline.hxx> +#include <android/compatibility.hxx> #include <algorithm> #include <cmath> #include <numeric> -#if defined(ANDROID) -namespace std -{ -template<typename T> -T round(T x) -{ - return ::round(x); -} -} -#endif namespace drawinglayer { diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 2ac5bbc0c8d6..4f9d16f76629 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -54,20 +54,10 @@ #include <vcl/window.hxx> #include <svtools/borderhelper.hxx> #include <editeng/borderline.hxx> +#include <android/compatibility.hxx> #include <com/sun/star/table/BorderLineStyle.hpp> -#if defined(ANDROID) -namespace std -{ -template<typename T> -T round(T x) -{ - return ::round(x); -} -} -#endif - using namespace com::sun::star; namespace drawinglayer |