[Bug 208491] benchmarks/iperf: Fix build with libc++ 3.8.0

[bugzilla-noreply at freebsd.org]

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

            Bug ID: 208491
           Summary: benchmarks/iperf: 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: sunpoet at FreeBSD.org
          Reporter: dim at FreeBSD.org
          Assignee: sunpoet at FreeBSD.org
             Flags: maintainer-feedback?(sunpoet at FreeBSD.org)

Created attachment 168941
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=168941&action=edit
benchmarks/iperf: don't attempt to redefine bool for C++

During the exp-run in bug 208158, it was found that benchmarks/iperf gives
errors with libc++ 3.8.0 [1]:

In file included from delay.cpp:53:
In file included from ../include/Timestamp.hpp:63:
In file included from ../include/headers.h:85:
In file included from /usr/include/c++/v1/math.h:309:
/usr/include/c++/v1/type_traits:647:29: error: redefinition of
'std::__1::__libcpp_is_integral<int>'
template <>          struct __libcpp_is_integral<int>                : public
true_type {};
                            ^~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/c++/v1/type_traits:636:29: note: previous definition is here
template <>          struct __libcpp_is_integral<bool>               : public
true_type {};
                            ^

This is because iperf's config.h #defines bool as int, but this is of course
only applicable to C sources, not C++.  Fix this by surrounding the
redefinition with #ifndef __cplusplus.

[1]
http://package18.nyi.freebsd.org/data/headamd64PR208158-default/2016-03-22_18h30m05s/logs/errors/iperf-2.0.5.log

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