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
This commit is contained in:
parent
66480821b3
commit
1b20109b04
@ -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)
|
||||
}
|
||||
|
||||
|
||||
@ -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)
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user