visitNull() takes a nullptr_t

This commit is contained in:
Benoit Blanchon
2023-07-10 16:14:56 +02:00
parent 1d07abddcd
commit 64922343e6
6 changed files with 12 additions and 12 deletions

View File

@ -93,7 +93,7 @@ class JsonSerializer : public VariantDataVisitor<size_t> {
return bytesWritten();
}
size_t visitNull() {
size_t visitNull(nullptr_t) {
formatter_.writeRaw("null");
return bytesWritten();
}

View File

@ -172,7 +172,7 @@ class MsgPackSerializer : public VariantDataVisitor<size_t> {
return bytesWritten();
}
size_t visitNull() {
size_t visitNull(nullptr_t) {
writeByte(0xC0);
return bytesWritten();
}

View File

@ -31,7 +31,7 @@ struct JsonVariantVisitor {
return TResult();
}
TResult visitNull() {
TResult visitNull(nullptr_t) {
return TResult();
}
@ -92,8 +92,8 @@ class VisitorAdapter {
return visitor_->visitBoolean(value);
}
result_type visitNull() {
return visitor_->visitNull();
result_type visitNull(nullptr_t) {
return visitor_->visitNull(nullptr);
}
private:
@ -106,7 +106,7 @@ typename TVisitor::result_type accept(JsonVariantConst variant,
TVisitor& visitor) {
auto data = VariantAttorney::getData(variant);
if (!data)
return visitor.visitNull();
return visitor.visitNull(nullptr);
auto resources = VariantAttorney::getResourceManager(variant);
VisitorAdapter<TVisitor> adapter(visitor, resources);
return data->accept(adapter);

View File

@ -35,7 +35,7 @@ struct Comparer<T, typename enable_if<IsString<T>::value>::type>
return COMPARE_RESULT_EQUAL;
}
CompareResult visitNull() {
CompareResult visitNull(nullptr_t) {
if (adaptString(rhs).isNull())
return COMPARE_RESULT_EQUAL;
else
@ -69,7 +69,7 @@ struct Comparer<T, typename enable_if<is_integral<T>::value ||
};
struct NullComparer : ComparerBase {
CompareResult visitNull() {
CompareResult visitNull(nullptr_t) {
return COMPARE_RESULT_EQUAL;
}
};
@ -167,7 +167,7 @@ struct VariantComparer : ComparerBase {
return reverseResult(comparer);
}
CompareResult visitNull() {
CompareResult visitNull(nullptr_t) {
NullComparer comparer;
return reverseResult(comparer);
}

View File

@ -58,7 +58,7 @@ class VariantData {
return visitor.visitBoolean(content_.asBoolean != 0);
default:
return visitor.visitNull();
return visitor.visitNull(nullptr);
}
}
@ -68,7 +68,7 @@ class VariantData {
if (var != 0)
return var->accept(visitor);
else
return visitor.visitNull();
return visitor.visitNull(nullptr);
}
VariantData* addElement(ResourceManager* resources) {

View File

@ -31,7 +31,7 @@ struct VariantDataVisitor {
return TResult();
}
TResult visitNull() {
TResult visitNull(nullptr_t) {
return TResult();
}