diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-01-08 17:23:41 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2018-01-08 17:23:41 +0000 |
| commit | 1cbe9b301ab94a293a8a4908ac7bfa28098b43df (patch) | |
| tree | 469d1437477b12c51ae203bde7cc6a62963e65f0 /games/iortcw | |
| parent | 14be0111eee78f50ca658268b388c2b5d99e1d51 (diff) | |
| download | ports-1cbe9b301ab94a293a8a4908ac7bfa28098b43df.tar.gz ports-1cbe9b301ab94a293a8a4908ac7bfa28098b43df.zip | |
games/iortcw: Fix build with clang 6.0
code/splines/util_str.cpp:477:11: error: reinterpret_cast from 'nullptr_t' to
'const char *' is not allowed
idStr e( reinterpret_cast<const char *>( NULL ) );
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
code/splines/util_str.cpp:491:10: error: reinterpret_cast from 'nullptr_t' to
'const char *' is not allowed
a = c + reinterpret_cast<const char *>( NULL );
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
code/splines/util_str.cpp:494:6: error: reinterpret_cast from 'nullptr_t' to
'const char *' is not allowed
a = reinterpret_cast<const char *>( NULL ) + d;
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
code/splines/util_str.cpp:498:7: error: reinterpret_cast from 'nullptr_t' to
'const char *' is not allowed
a += reinterpret_cast<const char *>( NULL );
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
PR: 224988
Reported by: jbeich
Notes
Notes:
svn path=/head/; revision=458458
Diffstat (limited to 'games/iortcw')
| -rw-r--r-- | games/iortcw/files/patch-clang6 | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/games/iortcw/files/patch-clang6 b/games/iortcw/files/patch-clang6 new file mode 100644 index 000000000000..2cd851652173 --- /dev/null +++ b/games/iortcw/files/patch-clang6 @@ -0,0 +1,54 @@ +Comment unused TestStringClass() and fix build with Clang 6 + +code/splines/util_str.cpp:477:11: error: reinterpret_cast from 'nullptr_t' to +'const char *' is not allowed + idStr e( reinterpret_cast<const char *>( NULL ) ); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +code/splines/util_str.cpp:491:10: error: reinterpret_cast from 'nullptr_t' to +'const char *' is not allowed + a = c + reinterpret_cast<const char *>( NULL ); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +code/splines/util_str.cpp:494:6: error: reinterpret_cast from 'nullptr_t' to +'const char *' is not allowed + a = reinterpret_cast<const char *>( NULL ) + d; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +code/splines/util_str.cpp:498:7: error: reinterpret_cast from 'nullptr_t' to +'const char *' is not allowed + a += reinterpret_cast<const char *>( NULL ); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +--- MP/code/splines/util_str.cpp.orig 2018-01-08 12:19:28 UTC ++++ MP/code/splines/util_str.cpp +@@ -454,6 +454,7 @@ void idStr::snprintf + #pragma warning(disable : 4189) // local variable is initialized but not referenced + #endif + ++#if 0 + /* + ================= + TestStringClass +@@ -526,6 +527,7 @@ void TestStringClass + + a[1] = '1'; // a.data = "t1st", b.data = "test" + } ++#endif + + #ifdef _MSC_VER + #pragma warning(default : 4189) // local variable is initialized but not referenced +--- SP/code/splines/util_str.cpp.orig 2018-01-08 12:19:44 UTC ++++ SP/code/splines/util_str.cpp +@@ -454,6 +454,7 @@ void idStr::snprintf + #pragma warning(disable : 4189) // local variable is initialized but not referenced + #endif + ++#if 0 + /* + ================= + TestStringClass +@@ -526,6 +527,7 @@ void TestStringClass + + a[1] = '1'; // a.data = "t1st", b.data = "test" + } ++#endif + + #ifdef _MSC_VER + #pragma warning(default : 4189) // local variable is initialized but not referenced |