From 8b5d19a4040b823f6faef9ef893b7be6eba71b43 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 21 Jan 2018 02:23:59 +0000 Subject: [PATCH] archivers/xmill: unbreak build with Clang 6 (C++14 by default) ./xmillinspect/exprinfo.cpp:64:10: 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 --- .../files/patch-xmillinspect_exprinfo.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 archivers/xmill/files/patch-xmillinspect_exprinfo.cpp diff --git a/archivers/xmill/files/patch-xmillinspect_exprinfo.cpp b/archivers/xmill/files/patch-xmillinspect_exprinfo.cpp new file mode 100644 index 000000000000..c62579e47251 --- /dev/null +++ b/archivers/xmill/files/patch-xmillinspect_exprinfo.cpp @@ -0,0 +1,18 @@ +./xmillinspect/exprinfo.cpp:64:10: 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 + ^~~~~~~ + +--- xmillinspect/exprinfo.cpp.orig 2003-03-23 15:06:16 UTC ++++ xmillinspect/exprinfo.cpp +@@ -61,7 +61,7 @@ int ExprInfo::getSubContainerType(int sub) + if (expr) { + return expr->getContainerType(); + } else { +- return NULL; ++ return 0; + } + } +