riyyi/manafiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Util: Change nullptr stringification

Browse Source
This commit is contained in:
Riyyi
2022-08-03 15:49:43 +02:00
parent 1b7a736be2
commit 5e419f501d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/format/formatter.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ void Formatter<const char*>::format(Builder& builder, const char* value) const
{ {
Formatter<std::string_view>::format( Formatter<std::string_view>::format(
builder, builder,
value != nullptr ? std::string_view { value, strlen(value) } : "(nil)"); value != nullptr ? std::string_view { value, strlen(value) } : "nullptr");
} }
// Pointer // Pointer
src/util/format/formatter.h
+1 -1
View File
@@ -149,7 +149,7 @@ struct Formatter<T*> {
void format(Builder& builder, T* value) const void format(Builder& builder, T* value) const
{ {
value == nullptr value == nullptr
? builder.putString("0x0") ? builder.putString("nullptr")
: builder.putPointer(static_cast<const void*>(value)); : builder.putPointer(static_cast<const void*>(value));
} }
}; };
test/unit/testutilformat.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ TEST_CASE(FormatBasicTypes)
EXPECT_EQ(result, ""); EXPECT_EQ(result, "");
result = Util::format("{}", nullptr); result = Util::format("{}", nullptr);
EXPECT_EQ(result, "(nil)"); EXPECT_EQ(result, "nullptr");
int* number = new int(3); int* number = new int(3);
result = Util::format("{}", number); result = Util::format("{}", number);