diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-04-13 16:17:47 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-04-13 16:17:47 +0000 |
| commit | ca0bd831ae5199d447ee5f9b1f1f9209102972ea (patch) | |
| tree | 024121c44d9929eed4395fc177fdc7dc2de6f514 /java | |
| parent | Update pystatgrab to 0.7. (diff) | |
games/assaultcube: unbreak build with newer C++ library
- Add upstream fixes for clang/libc++ 3.8 and gcc/libstdc++ 6.0
- Remove merged files/patch-source_src_bot_bot_waypoint.cpp file
- Bump PORTREVISION
In file included from crypto.cpp:1:
In file included from ./cube.h:8:
./tools.h:58:21: error: static declaration of 'round' follows non-static
declaration
static inline float round(float x) { return floor(x + 0.5f); }
^
/usr/include/c++/v1/math.h:1364:46: note: previous definition is here
inline _LIBCPP_INLINE_VISIBILITY float round(float __lcpp_x) _NOEXCEPT
{return roundf(__lcpp_x);}
^
In file included from cube.h:8:0,
from crypto.cpp:1:
tools.h: In function 'float round(float)':
tools.h:58:34: error: 'float round(float)' conflicts with a previous declaration
static inline float round(float x) { return floor(x + 0.5f); }
^
In file included from /usr/local/lib/gcc6/include/c++/math.h:36:0,
from platform.h:9,
from cube.h:7,
from crypto.cpp:1:
/usr/local/lib/gcc6/include/c++/cmath:1708:3: note: previous declaration 'constexpr float std::round(float)'
round(float __x)
^~~~~
PR: 208754
Reported by: dim (libc++), lightside (libstdc++)
Submitted by: lightside <lightside@gmx.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=413214
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions
