1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-05 01:55:52 +00:00
freebsd-ports/games/avanor/files/patch-creature__Uniquem.cpp
Jan Beich 1c266da5ed 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
2018-01-20 17:46:12 +00:00

20 lines
577 B
C++

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];