cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

games/aquaria: unbreak build with Clang 6 (C++14 by default)

Browse Source 
Aquaria/ScriptInterface.cpp:10412:59: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
 #define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix)"_"MK_STR(alias), l_##prefix##_##suffix},
                                                           ^

Reported by:	antoine (via bug 224669)
This commit is contained in:
Jan Beich 2018-01-06 05:58:28 +00:00
parent 59eb10ff95
commit ae514f7521
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=458223
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
games/aquaria/files/patch-Aquaria_ScriptInterface.cpp Normal file
View File

@ -0,0 +1,15 @@
Aquaria/ScriptInterface.cpp:10412:59: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix)"_"MK_STR(alias), l_##prefix##_##suffix},
^
--- Aquaria/ScriptInterface.cpp.orig 2016-06-19 23:56:27 UTC
+++ Aquaria/ScriptInterface.cpp
@@ -10409,7 +10409,7 @@ static const struct {
#undef MK_ALIAS
#define MK_FUNC(base, getter, prefix, suffix) luaRegister(prefix##_##suffix),
#define MK_STR(s) #s
-#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix)"_"MK_STR(alias), l_##prefix##_##suffix},
+#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix) "_" MK_STR(alias), l_##prefix##_##suffix},
EXPAND_FUNC_PROTOTYPES