svn commit: r459534 - head/games/avanor/files
Jan Beich
jbeich at FreeBSD.org
Sat Jan 20 17:46:13 UTC 2018
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];
More information about the svn-ports-head
mailing list