Skip to content

Commit 95e4b10

Browse files
CEL Dev Teamcopybara-github
authored andcommitted
No public description
PiperOrigin-RevId: 934095048
1 parent e2ed527 commit 95e4b10

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

codelab/network_functions.cc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ std::optional<NetworkAddressRep> NetworkAddressRep::Unwrap(
368368
auto opaque = value.AsOpaque();
369369
if (!opaque.has_value() ||
370370
opaque->GetTypeId() != cel::TypeId<NetworkAddressRep>()) {
371-
return absl::nullopt;
371+
return std::nullopt;
372372
}
373373

374374
// Note: safety depends on:
@@ -385,10 +385,10 @@ std::optional<NetworkAddressRep> NetworkAddressRep::Parse(
385385
char ipv6[16];
386386
auto version = ParseAddressImpl(str, &ipv4, ipv6);
387387
if (!version.ok()) {
388-
return absl::nullopt;
388+
return std::nullopt;
389389
}
390390
if (*version != IpVersion::kIPv4) {
391-
return absl::nullopt;
391+
return std::nullopt;
392392
}
393393
NetworkAddressRep rep;
394394
rep.version_ = *version;
@@ -422,7 +422,7 @@ std::optional<NetworkAddressMatcher> NetworkAddressMatcher::Parse(
422422
int dash_pos = str.find('-');
423423
if (dash_pos == absl::string_view::npos) {
424424
// TODO(uncreated-issue/86): CIDR style addr/prefix-length
425-
return absl::nullopt;
425+
return std::nullopt;
426426
}
427427
absl::string_view min_str = str.substr(0, dash_pos);
428428
absl::string_view max_str = str.substr(dash_pos + 1);
@@ -431,23 +431,23 @@ std::optional<NetworkAddressMatcher> NetworkAddressMatcher::Parse(
431431
NetworkRangev6 v6;
432432
auto min_parse = ParseAddressImpl(min_str, &v4.min_incl, v6.min_incl);
433433
if (!min_parse.ok()) {
434-
return absl::nullopt;
434+
return std::nullopt;
435435
}
436436
auto max_parse = ParseAddressImpl(max_str, &v4.max_incl, v6.max_incl);
437437
if (!max_parse.ok()) {
438-
return absl::nullopt;
438+
return std::nullopt;
439439
}
440440
if (*min_parse != *max_parse) {
441-
return absl::nullopt;
441+
return std::nullopt;
442442
}
443443
NetworkAddressMatcher rep;
444444
if (*min_parse == IpVersion::kIPv4) {
445445
if (v4.min_incl > v4.max_incl) {
446-
return absl::nullopt;
446+
return std::nullopt;
447447
}
448448
rep.ranges_v4_.push_back(v4);
449449
} else if (*min_parse == IpVersion::kIPv6) {
450-
return absl::nullopt;
450+
return std::nullopt;
451451
}
452452

453453
return rep;

0 commit comments

Comments
 (0)