From 543465e012f5bfecdb365f733e81e59efdd4c3dd Mon Sep 17 00:00:00 2001 From: Don Lewis Date: Thu, 26 May 2016 06:01:49 +0000 Subject: Fix build of openoffice-4 and openoffice-devel with libc++ 3.8.0. Openffice defines its own overloaded variant of round(), which is only different in return type from the 'real' round() from , so it is ambiguous (in the C++ lookup sense). Fix this by renaming the custom round() to round_(), and using a define to minimize needed changes in the code. PR: 209588 Submitted by: dim --- .../files/patch-vcl_source_glyphs_graphite__layout.cxx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx (limited to 'editors/openoffice-devel/files') diff --git a/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx b/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx new file mode 100644 index 000000000000..35a42abb317b --- /dev/null +++ b/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx @@ -0,0 +1,14 @@ +--- vcl/source/glyphs/graphite_layout.cxx.orig 2014-02-25 08:33:06 UTC ++++ vcl/source/glyphs/graphite_layout.cxx +@@ -107,9 +107,10 @@ namespace + typedef ext_std::pair glyph_range_t; + typedef ext_std::pair glyph_set_range_t; + +- inline long round(const float n) { ++ inline long round_(const float n) { + return long(n + (n < 0 ? -0.5 : 0.5)); + } ++#define round round_ + + + template -- cgit v1.2.3