From owner-svn-ports-all@freebsd.org Sat Jan 6 06:00:02 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDB38EC0066; Sat, 6 Jan 2018 06:00:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C87DE7680C; Sat, 6 Jan 2018 06:00:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 28129B7B4; Sat, 6 Jan 2018 06:00:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w06602NB013394; Sat, 6 Jan 2018 06:00:02 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w06602iZ013393; Sat, 6 Jan 2018 06:00:02 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801060600.w06602iZ013393@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 6 Jan 2018 06:00:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458225 - branches/2018Q1/games/aquaria/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q1/games/aquaria/files X-SVN-Commit-Revision: 458225 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jan 2018 06:00:03 -0000 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 +