diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-06-17 21:24:37 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-06-17 21:24:37 +0000 |
| commit | f4f3ca1781c40c8bfad9443462f173e1f01c809f (patch) | |
| tree | 0cf3146bd220f8fdecfc5fa3f90df5d16531eb0d /graphics/Coin/files/patch-hg-11629.diff | |
| parent | New port: science/py-PyQuante: Quantum chemistry in Python (diff) | |
The update to CMake 3.12 showed up compile failures (see the new patches,
all of which are from upstream). All of these show Clang being more strict
in its C++ than before.
Reported by: tcberner
Obtained from: upstream
Notes
Notes:
svn path=/head/; revision=472637
Diffstat (limited to '')
| -rw-r--r-- | graphics/Coin/files/patch-hg-11629.diff | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/graphics/Coin/files/patch-hg-11629.diff b/graphics/Coin/files/patch-hg-11629.diff new file mode 100644 index 000000000000..4d5c16894003 --- /dev/null +++ b/graphics/Coin/files/patch-hg-11629.diff @@ -0,0 +1,27 @@ +NUL-terminate the string, instead of accidentally setting the +pointer to NULL (which fails to compile on 12-CURRENT due to +converting char to pointer). + +From upstream revision 11629. + +diff -r fbd6ca1c1436 -r 6008c4bd6ba6 src/3ds/SoStream.cpp +--- src/3ds/SoStream.cpp Wed Aug 30 13:05:43 2017 +0200 ++++ src/3ds/SoStream.cpp Wed Aug 30 13:06:50 2017 +0200 +@@ -185,7 +185,7 @@ + if (!gotNum) { setBadBit(); return FALSE; } \ + \ + char *ce; \ +- s = '\0'; \ ++ *s = '\0'; \ + _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \ + \ + if (ce != s) \ +@@ -282,7 +282,7 @@ + gotAll: \ + \ + char *ce; \ +- s = '\0'; \ ++ *s = '\0'; \ + double tempVal = _convertFunc_(buf, &ce); \ + \ + if (ce != s) \ |