From 1b20109b04061304eab84cf921a030300b4f9fe3 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 2 Mar 2022 15:24:44 +0100 Subject: [PATCH] Squashed 'src/leveldb/' changes from f8ae182c1e..330dd6235f 330dd6235f Merge bitcoin-core/leveldb-subtree#31: Use memory_order symbols consistently 93ee8d875e Merge pull request #965 from ShawnZhong:cpp20 git-subtree-dir: src/leveldb git-subtree-split: 330dd6235f50c01e49b4cfadf6df9e026dc61f0d --- 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 9f5863a0f35..18626b327c6 100644 --- a/util/env_posix.cc +++ b/util/env_posix.cc @@ -850,7 +850,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"); @@ -867,7 +867,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 1834206562c..4dcba222a1b 100644 --- a/util/env_windows.cc +++ b/util/env_windows.cc @@ -798,7 +798,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"); @@ -815,7 +815,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) }