[Bug 209588] editors/openoffice-4 editors/openoffice-devel: Fix build with libc++ 3.8.0

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=209588

            Bug ID: 209588
           Summary: editors/openoffice-4 editors/openoffice-devel: Fix
                    build with libc++ 3.8.0
           Product: Ports & Packages
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Some People
          Priority: ---
         Component: Individual Port(s)
          Assignee: office at FreeBSD.org
          Reporter: dim at FreeBSD.org
             Flags: maintainer-feedback?(office at FreeBSD.org)
          Assignee: office at FreeBSD.org

Created attachment 170415
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=170415&action=edit
Rename custom round() and use a define to minimize changes

During the exp-run in bug 208158, it was found that editors/openoffice-4 [1]
and editors/openoffice-devel [2] give errors with libc++ 3.8.0:

/wrkdirs/usr/ports/editors/openoffice-4/work/aoo-4.1.2/main/vcl/source/glyphs/graphite_layout.cxx:297:21:
error: call to 'round' is ambiguous
    long nXOffset = round(fMinX * fScaling);
                    ^~~~~

This is because openoffice 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.

[1]
http://package18.nyi.freebsd.org/data/headamd64PR208158-default/2016-05-01_10h29m48s/logs/errors/apache-openoffice-4.1.2_5.log
[2]
http://package18.nyi.freebsd.org/data/headamd64PR208158-default/2016-05-01_10h29m48s/logs/errors/apache-openoffice-devel-4.2.1735889_1,4.log

-- 
You are receiving this mail because:
You are the assignee for the bug.