From owner-svn-ports-head@freebsd.org Mon Jan 8 17:23:43 2018 Return-Path: Delivered-To: svn-ports-head@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 3C2D6E79083; Mon, 8 Jan 2018 17:23:43 +0000 (UTC) (envelope-from tobik@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 1636E3F8A; Mon, 8 Jan 2018 17:23:43 +0000 (UTC) (envelope-from tobik@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 53A6F2A73; Mon, 8 Jan 2018 17:23:42 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w08HNgoZ099252; Mon, 8 Jan 2018 17:23:42 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w08HNguu099251; Mon, 8 Jan 2018 17:23:42 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201801081723.w08HNguu099251@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 8 Jan 2018 17:23:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458458 - head/games/iortcw/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/games/iortcw/files X-SVN-Commit-Revision: 458458 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jan 2018 17:23:43 -0000 Author: tobik Date: Mon Jan 8 17:23:41 2018 New Revision: 458458 URL: https://svnweb.freebsd.org/changeset/ports/458458 Log: games/iortcw: Fix build with clang 6.0 code/splines/util_str.cpp:477:11: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed idStr e( reinterpret_cast( NULL ) ); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ code/splines/util_str.cpp:491:10: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed a = c + reinterpret_cast( NULL ); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ code/splines/util_str.cpp:494:6: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed a = reinterpret_cast( NULL ) + d; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ code/splines/util_str.cpp:498:7: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed a += reinterpret_cast( NULL ); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 224988 Reported by: jbeich Added: head/games/iortcw/files/patch-clang6 (contents, props changed) Added: head/games/iortcw/files/patch-clang6 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/iortcw/files/patch-clang6 Mon Jan 8 17:23:41 2018 (r458458) @@ -0,0 +1,54 @@ +Comment unused TestStringClass() and fix build with Clang 6 + +code/splines/util_str.cpp:477:11: error: reinterpret_cast from 'nullptr_t' to +'const char *' is not allowed + idStr e( reinterpret_cast( NULL ) ); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +code/splines/util_str.cpp:491:10: error: reinterpret_cast from 'nullptr_t' to +'const char *' is not allowed + a = c + reinterpret_cast( NULL ); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +code/splines/util_str.cpp:494:6: error: reinterpret_cast from 'nullptr_t' to +'const char *' is not allowed + a = reinterpret_cast( NULL ) + d; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +code/splines/util_str.cpp:498:7: error: reinterpret_cast from 'nullptr_t' to +'const char *' is not allowed + a += reinterpret_cast( NULL ); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +--- MP/code/splines/util_str.cpp.orig 2018-01-08 12:19:28 UTC ++++ MP/code/splines/util_str.cpp +@@ -454,6 +454,7 @@ void idStr::snprintf + #pragma warning(disable : 4189) // local variable is initialized but not referenced + #endif + ++#if 0 + /* + ================= + TestStringClass +@@ -526,6 +527,7 @@ void TestStringClass + + a[1] = '1'; // a.data = "t1st", b.data = "test" + } ++#endif + + #ifdef _MSC_VER + #pragma warning(default : 4189) // local variable is initialized but not referenced +--- SP/code/splines/util_str.cpp.orig 2018-01-08 12:19:44 UTC ++++ SP/code/splines/util_str.cpp +@@ -454,6 +454,7 @@ void idStr::snprintf + #pragma warning(disable : 4189) // local variable is initialized but not referenced + #endif + ++#if 0 + /* + ================= + TestStringClass +@@ -526,6 +527,7 @@ void TestStringClass + + a[1] = '1'; // a.data = "t1st", b.data = "test" + } ++#endif + + #ifdef _MSC_VER + #pragma warning(default : 4189) // local variable is initialized but not referenced