svn commit: r458225 - branches/2018Q1/games/aquaria/files

[Jan Beich]

Author: jbeich
Date: Sat Jan  6 06:00:01 2018
New Revision: 458225
URL: https://svnweb.freebsd.org/changeset/ports/458225

Log:
  MFH: r458223
  
  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)
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q1/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp
     - copied unchanged from r458223, head/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp
Modified:
Directory Properties:
  branches/2018Q1/   (props changed)

Copied: branches/2018Q1/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp (from r458223, head/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp	Sat Jan  6 06:00:01 2018	(r458225, copy of r458223, head/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp)
@@ -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
+