svn commit: r458223 - head/games/aquaria/files

Jan Beich jbeich at FreeBSD.org
Sat Jan 6 05:58:30 UTC 2018


Author: jbeich
Date: Sat Jan  6 05:58:28 2018
New Revision: 458223
URL: https://svnweb.freebsd.org/changeset/ports/458223

Log:
  games/aquaria: unbreak build with Clang 6 (C++14 by default)
  
  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)

Added:
  head/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp   (contents, props changed)

Added: head/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp	Sat Jan  6 05:58:28 2018	(r458223)
@@ -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
+ 


More information about the svn-ports-all mailing list