From 93ee8d875e9994dc8353af5a680f9950de322194 Mon Sep 17 00:00:00 2001 From: Victor Costan Date: Sat, 8 Jan 2022 20:55:42 +0000 Subject: [PATCH] Merge pull request #965 from ShawnZhong:cpp20 PiperOrigin-RevId: 420504266 (cherry picked from commit e4ccaa0c9cb1a019df3df74eb5db4ec55e9e02ed) --- util/env_posix.cc | 4 ++-- util/env_windows.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/env_posix.cc b/util/env_posix.cc index 00ca9aedef..c57f4594d9 100644 --- a/util/env_posix.cc +++ b/util/env_posix.cc @@ -837,7 +837,7 @@ class SingletonEnv { public: SingletonEnv() { #if !defined(NDEBUG) - env_initialized_.store(true, std::memory_order::memory_order_relaxed); + env_initialized_.store(true, std::memory_order_relaxed); #endif // !defined(NDEBUG) static_assert(sizeof(env_storage_) >= sizeof(EnvType), "env_storage_ will not fit the Env"); @@ -854,7 +854,7 @@ class SingletonEnv { static void AssertEnvNotInitialized() { #if !defined(NDEBUG) - assert(!env_initialized_.load(std::memory_order::memory_order_relaxed)); + assert(!env_initialized_.load(std::memory_order_relaxed)); #endif // !defined(NDEBUG) } diff --git a/util/env_windows.cc b/util/env_windows.cc index 2dd7794f66..f0f14ff4e1 100644 --- a/util/env_windows.cc +++ b/util/env_windows.cc @@ -749,7 +749,7 @@ class SingletonEnv { public: SingletonEnv() { #if !defined(NDEBUG) - env_initialized_.store(true, std::memory_order::memory_order_relaxed); + env_initialized_.store(true, std::memory_order_relaxed); #endif // !defined(NDEBUG) static_assert(sizeof(env_storage_) >= sizeof(EnvType), "env_storage_ will not fit the Env"); @@ -766,7 +766,7 @@ class SingletonEnv { static void AssertEnvNotInitialized() { #if !defined(NDEBUG) - assert(!env_initialized_.load(std::memory_order::memory_order_relaxed)); + assert(!env_initialized_.load(std::memory_order_relaxed)); #endif // !defined(NDEBUG) }