Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions runtime/standard/equality_functions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ absl::optional<Number> NumberFromValue(const Value& value) {
return Number::FromDouble(value.GetDouble().NativeValue());
}

return absl::nullopt;
return std::nullopt;
}

absl::StatusOr<absl::optional<Value>> CheckAlternativeNumericType(
Expand All @@ -192,7 +192,7 @@ absl::StatusOr<absl::optional<Value>> CheckAlternativeNumericType(
absl::optional<Number> number = NumberFromValue(key);

if (!number.has_value()) {
return absl::nullopt;
return std::nullopt;
}

if (!key.IsInt() && number->LosslessConvertibleToInt()) {
Expand All @@ -215,7 +215,7 @@ absl::StatusOr<absl::optional<Value>> CheckAlternativeNumericType(
}
}

return absl::nullopt;
return std::nullopt;
}

// Equality for maps. Template parameter provides either heterogeneous or
Expand Down Expand Up @@ -440,7 +440,7 @@ absl::StatusOr<absl::optional<bool>> HomogenousValueEqual(
google::protobuf::MessageFactory* absl_nonnull message_factory,
google::protobuf::Arena* absl_nonnull arena) {
if (v1.kind() != v2.kind()) {
return absl::nullopt;
return std::nullopt;
}

static_assert(std::is_lvalue_reference_v<decltype(v1.GetString())>,
Expand Down Expand Up @@ -483,7 +483,7 @@ absl::StatusOr<absl::optional<bool>> HomogenousValueEqual(
return OpaqueEqual(v1.GetOpaque(), v2.GetOpaque(), descriptor_pool,
message_factory, arena);
default:
return absl::nullopt;
return std::nullopt;
}
}

Expand Down Expand Up @@ -582,7 +582,7 @@ absl::StatusOr<absl::optional<bool>> ValueEqualImpl(
// map containing an Error. Return no matching overload to propagate an error
// instead of a false result.
if (v1.IsError() || v1.IsUnknown() || v2.IsError() || v2.IsUnknown()) {
return absl::nullopt;
return std::nullopt;
}

return false;
Expand Down
Loading