diff options
| author | Victor Costan <pwnall@chromium.org> | 2022-01-08 20:55:42 +0000 |
|---|---|---|
| committer | Victor Costan <pwnall@chromium.org> | 2022-01-08 20:55:42 +0000 |
| commit | e4ccaa0c9cb1a019df3df74eb5db4ec55e9e02ed (patch) | |
| tree | 0fcc62fd6bdd963d156180740652872fd164e19d | |
| parent | c8b708d496090c04433b68233b6d4ccb30b8aea6 (diff) | |
| parent | 7a2f64ed504f510425183fa225ae80c671f0145f (diff) | |
| download | leveldb-e4ccaa0c9cb1a019df3df74eb5db4ec55e9e02ed.tar.gz | |
Merge pull request #965 from ShawnZhong:cpp20
PiperOrigin-RevId: 420504266
| -rw-r--r-- | util/env_posix.cc | 4 | ||||
| -rw-r--r-- | 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 8405909..936d43d 100644 --- a/util/env_posix.cc +++ b/util/env_posix.cc @@ -870,7 +870,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"); @@ -887,7 +887,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 c6d439c..1c74b02 100644 --- a/util/env_windows.cc +++ b/util/env_windows.cc @@ -765,7 +765,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"); @@ -782,7 +782,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) } |