tqcq/leveldb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #965 from ShawnZhong:cpp20

Browse Source 
PiperOrigin-RevId: 420504266
This commit is contained in:
Victor Costan 2022-01-08 20:55:42 +00:00
commit e4ccaa0c9c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/env_posix.cc
View File

@ -870,7 +870,7 @@ class SingletonEnv {
public: public:
SingletonEnv() { SingletonEnv() {
#if !defined(NDEBUG) #if !defined(NDEBUG)
env_initialized_.store(true, std::memory_order::memory_order_relaxed); env_initialized_.store(true, std::memory_order_relaxed);
#endif // !defined(NDEBUG) #endif // !defined(NDEBUG)
static_assert(sizeof(env_storage_) >= sizeof(EnvType), static_assert(sizeof(env_storage_) >= sizeof(EnvType),
"env_storage_ will not fit the Env"); "env_storage_ will not fit the Env");
@ -887,7 +887,7 @@ class SingletonEnv {
static void AssertEnvNotInitialized() { static void AssertEnvNotInitialized() {
#if !defined(NDEBUG) #if !defined(NDEBUG)
assert(!env_initialized_.load(std::memory_order::memory_order_relaxed)); assert(!env_initialized_.load(std::memory_order_relaxed));
#endif // !defined(NDEBUG) #endif // !defined(NDEBUG)
} }

4
util/env_windows.cc
View File

@ -765,7 +765,7 @@ class SingletonEnv {
public: public:
SingletonEnv() { SingletonEnv() {
#if !defined(NDEBUG) #if !defined(NDEBUG)
env_initialized_.store(true, std::memory_order::memory_order_relaxed); env_initialized_.store(true, std::memory_order_relaxed);
#endif // !defined(NDEBUG) #endif // !defined(NDEBUG)
static_assert(sizeof(env_storage_) >= sizeof(EnvType), static_assert(sizeof(env_storage_) >= sizeof(EnvType),
"env_storage_ will not fit the Env"); "env_storage_ will not fit the Env");
@ -782,7 +782,7 @@ class SingletonEnv {
static void AssertEnvNotInitialized() { static void AssertEnvNotInitialized() {
#if !defined(NDEBUG) #if !defined(NDEBUG)
assert(!env_initialized_.load(std::memory_order::memory_order_relaxed)); assert(!env_initialized_.load(std::memory_order_relaxed));
#endif // !defined(NDEBUG) #endif // !defined(NDEBUG)
} }