From 8d176b75c88aa8a60fc3e52ef925af4dba8bf181 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Wed, 30 Aug 2017 14:45:11 +0000 Subject: [PATCH] gcc8: static_cast NULL instead of reinterpret_cast --- libs/splines/util_str.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/splines/util_str.cpp b/libs/splines/util_str.cpp index 52a01a36..0c8dacb0 100644 --- a/libs/splines/util_str.cpp +++ b/libs/splines/util_str.cpp @@ -480,7 +480,7 @@ void TestStringClass idStr b; // b.len == 0, b.data == "\0" idStr c( "test" ); // c.len == 4, c.data == "test\0" idStr d( c ); // d.len == 4, d.data == "test\0" - idStr e( reinterpret_cast( NULL ) ); + idStr e( static_cast( NULL ) ); // e.len == 0, e.data == "\0" ASSERT! int i; // i == ? @@ -499,14 +499,14 @@ void TestStringClass a = NULL; // a.len == 0, a.data == "\0" ASSERT! a = c + d; // a.len == 8, a.data == "testtest\0" a = c + "wow"; // a.len == 7, a.data == "testwow\0" - a = c + reinterpret_cast( NULL ); + a = c + static_cast( NULL ); // a.len == 4, a.data == "test\0" ASSERT! a = "this" + d; // a.len == 8, a.data == "thistest\0" - a = reinterpret_cast( NULL ) + d; + a = static_cast( NULL ) + d; // a.len == 4, a.data == "test\0" ASSERT! a += c; // a.len == 8, a.data == "testtest\0" a += "wow"; // a.len == 11, a.data == "testtestwow\0" - a += reinterpret_cast( NULL ); + a += static_cast( NULL ); // a.len == 11, a.data == "testtestwow\0" ASSERT! a = "test"; // a.len == 4, a.data == "test\0"