diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2016-05-26 06:01:49 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2016-05-26 06:01:49 +0000 |
| commit | 543465e012f5bfecdb365f733e81e59efdd4c3dd (patch) | |
| tree | 41a4d0b5f0896c0e2820f3ac9ea0f6812597803c /editors/openoffice-devel/files | |
| parent | devel/soapui: fix license (diff) | |
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 <math.h>,
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
Notes
Notes:
svn path=/head/; revision=415875
Diffstat (limited to 'editors/openoffice-devel/files')
| -rw-r--r-- | editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
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<gr::GlyphIterator, gr::GlyphIterator> glyph_range_t; + typedef ext_std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> 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<typename T> |