From 9ac7062b1860d895fb5a8cbf58c3e9ef8f674b5f Mon Sep 17 00:00:00 2001 From: Derek Mauro <761129+derekmauro@users.noreply.github.com> Date: Mon, 3 Feb 2025 10:50:45 -0500 Subject: [PATCH] PR #1819: fix compilation with AppleClang (#1820) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1819 Fix the following error: absl/random/internal/randen_detect.cc:123:12: error: no member named 'nullopt' in namespace 'std'; did you mean 'absl::nullopt'? 123 | return std::nullopt; | ^~~~~~~~~~~~ | absl::nullopt absl/types/optional.h:86:43: note: 'absl::nullopt' declared here 86 | ABSL_INTERNAL_INLINE_CONSTEXPR(nullopt_t, nullopt, | ^ Merge b9a2d3920a472af7247876f58513aeb704fd3145 into 7253ff8f9571cf2877067ce11b984b059a0c53b7 Merging this change closes #1819 COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1819 from clementperon:master b9a2d3920a472af7247876f58513aeb704fd3145 PiperOrigin-RevId: 722599523 Change-Id: Ie66cbf9daf3b115668194da8b74acd6a43e12a03 Co-authored-by: Clément Péron --- absl/random/internal/randen_detect.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/absl/random/internal/randen_detect.cc b/absl/random/internal/randen_detect.cc index 828db4790ae..58948d59067 100644 --- a/absl/random/internal/randen_detect.cc +++ b/absl/random/internal/randen_detect.cc @@ -120,7 +120,7 @@ static absl::optional ReadSysctlByName(const char* name) { size_t val_size = sizeof(T); int ret = sysctlbyname(name, &val, &val_size, nullptr, 0); if (ret == -1) { - return std::nullopt; + return absl::nullopt; } return val; }