diff options
author | jbeich <jbeich@FreeBSD.org> | 2018-01-21 01:46:12 +0800 |
---|---|---|
committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 06:26:57 +0800 |
commit | 5fe09e255c5a16b08c39c5118b76514eab27795c (patch) | |
tree | 53c715061e8f17be8a38277ec53bf9ffb30c9ca6 /games | |
parent | 09944064e06534ecd91e42b178988e5a3b892053 (diff) | |
download | freebsd-ports-gnome-5fe09e255c5a16b08c39c5118b76514eab27795c.tar.gz freebsd-ports-gnome-5fe09e255c5a16b08c39c5118b76514eab27795c.tar.zst freebsd-ports-gnome-5fe09e255c5a16b08c39c5118b76514eab27795c.zip |
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
Diffstat (limited to 'games')
-rw-r--r-- | games/avanor/files/patch-creature__Uniquem.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/games/avanor/files/patch-creature__Uniquem.cpp b/games/avanor/files/patch-creature__Uniquem.cpp new file mode 100644 index 000000000000..bc35b2c62c80 --- /dev/null +++ b/games/avanor/files/patch-creature__Uniquem.cpp @@ -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]; |