diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-01-21 10:23:59 +0800 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-01-21 10:23:59 +0800 |
| commit | 8b5d19a4040b823f6faef9ef893b7be6eba71b43 (patch) | |
| tree | d03ef1d1d770404da81dc29b18158509428894b9 /archivers | |
| parent | 0ac5d66f690a0f0293418f39c5078a93023e83c7 (diff) | |
| download | freebsd-ports-8b5d19a4040b823f6faef9ef893b7be6eba71b43.tar.gz freebsd-ports-8b5d19a4040b823f6faef9ef893b7be6eba71b43.tar.zst freebsd-ports-8b5d19a4040b823f6faef9ef893b7be6eba71b43.zip | |
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
Notes
Notes:
svn path=/head/; revision=459569
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/xmill/files/patch-xmillinspect_exprinfo.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
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;
+ }
+ }
+
|