Date: Sat, 20 Jan 2018 17:46:12 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459534 - head/games/avanor/files Message-ID: <201801201746.w0KHkCOl032308@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Jan 20 17:46:12 2018 New Revision: 459534 URL: https://svnweb.freebsd.org/changeset/ports/459534 Log: games/avanor: unbreak build with Clang 6 (C++14 by default) creature/Uniquem.cpp:628:11: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t' return NULL; ^~~~ /usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' #define NULL nullptr ^~~~~~~ Reported by: pkg-fallout Added: head/games/avanor/files/patch-creature__Uniquem.cpp (contents, props changed) Added: head/games/avanor/files/patch-creature__Uniquem.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/avanor/files/patch-creature__Uniquem.cpp Sat Jan 20 17:46:12 2018 (r459534) @@ -0,0 +1,19 @@ +creature/Uniquem.cpp:628:11: error: cannot initialize return object of type 'int' with an rvalue of + type 'nullptr_t' + return NULL; + ^~~~ +/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' +#define NULL nullptr + ^~~~~~~ + +--- creature/Uniquem.cpp.orig 2003-12-10 07:03:57 UTC ++++ creature/Uniquem.cpp +@@ -625,7 +625,7 @@ int XYohjishiro::onGiveItem(XCreature * giver, XItem * + (*it)->Item()->Identify(1); + + } +- return NULL; ++ return 0; + } else + { + char tbuf[256];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801201746.w0KHkCOl032308>