MFH: r476829

devel/codeblocks-devel: unbreak with libc++ 5

In file included from sqvm.cpp:5:
In file included from /usr/include/c++/v1/math.h:310:
/usr/include/c++/v1/limits:148:85: error: expected expression
    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return type();}
                                                                                    ^
../../../../src/include/scripting/squirrel/sqobject.h:99:24: note: expanded from macro 'type'
 #define type(obj) ((obj)._type)
                        ^

Submitted by:	Michael Butler (based on)
Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2018-08-10 13:01:51 +00:00
parent 5189c56069
commit cc9d23bf15
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q3/; revision=476830

View File

@ -0,0 +1,24 @@
After https://reviews.llvm.org/rL301060 build fails:
In file included from sqvm.cpp:5:
In file included from /usr/include/c++/v1/math.h:310:
/usr/include/c++/v1/limits:148:85: error: expected expression
_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return type();}
^
../../../../src/include/scripting/squirrel/sqobject.h:99:24: note: expanded from macro 'type'
#define type(obj) ((obj)._type)
^
--- src/sdk/scripting/squirrel/sqvm.cpp.orig 2013-08-18 05:51:11 UTC
+++ src/sdk/scripting/squirrel/sqvm.cpp
@@ -1,9 +1,9 @@
/*
see copyright notice in squirrel.h
*/
-#include "sqpcheader.h"
#include <math.h>
#include <stdlib.h>
+#include "sqpcheader.h"
#include "sqopcodes.h"
#include "sqfuncproto.h"
#include "sqvm.h"