Skip to content

Commit b9894a1

Browse files
committed
Merge bitcoin/bitcoin#24461: build: Minor leveldb subtree update
1b20109 Squashed 'src/leveldb/' changes from f8ae182c1e..330dd6235f (MarcoFalke) Pull request description: A minor change to: * Consistently use the same symbol names in the whole project. * Fix compiling with C++20. ACKs for top commit: fanquake: ACK fa0c32e Tree-SHA512: b5d4540dd621cf4aa8caac811bae03bb74e502a31dbdda9354182e4caa39905550e62ad3cf8ea7d7f9bfc3e5120d119d34ab0f1e633716ec8089876037cbf192
2 parents cba41db + fa0c32e commit b9894a1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/leveldb/util/env_posix.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ class SingletonEnv {
850850
public:
851851
SingletonEnv() {
852852
#if !defined(NDEBUG)
853-
env_initialized_.store(true, std::memory_order::memory_order_relaxed);
853+
env_initialized_.store(true, std::memory_order_relaxed);
854854
#endif // !defined(NDEBUG)
855855
static_assert(sizeof(env_storage_) >= sizeof(EnvType),
856856
"env_storage_ will not fit the Env");
@@ -867,7 +867,7 @@ class SingletonEnv {
867867

868868
static void AssertEnvNotInitialized() {
869869
#if !defined(NDEBUG)
870-
assert(!env_initialized_.load(std::memory_order::memory_order_relaxed));
870+
assert(!env_initialized_.load(std::memory_order_relaxed));
871871
#endif // !defined(NDEBUG)
872872
}
873873

src/leveldb/util/env_windows.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ class SingletonEnv {
798798
public:
799799
SingletonEnv() {
800800
#if !defined(NDEBUG)
801-
env_initialized_.store(true, std::memory_order::memory_order_relaxed);
801+
env_initialized_.store(true, std::memory_order_relaxed);
802802
#endif // !defined(NDEBUG)
803803
static_assert(sizeof(env_storage_) >= sizeof(EnvType),
804804
"env_storage_ will not fit the Env");
@@ -815,7 +815,7 @@ class SingletonEnv {
815815

816816
static void AssertEnvNotInitialized() {
817817
#if !defined(NDEBUG)
818-
assert(!env_initialized_.load(std::memory_order::memory_order_relaxed));
818+
assert(!env_initialized_.load(std::memory_order_relaxed));
819819
#endif // !defined(NDEBUG)
820820
}
821821

0 commit comments

Comments
 (0)