--- a/re2/re2.cc (index) +++ b/re2/re2.cc (working tree) @@ -1312,7 +1312,7 @@ union Hook { #if !defined(__clang__) && defined(_MSC_VER) // Citing https://github.com/protocolbuffers/protobuf/pull/4777 as precedent, // this is a gross hack to make std::atomic constant-initialized on MSVC. - static_assert(ATOMIC_POINTER_LOCK_FREE == 2, + static_assert(std::atomic::is_always_lock_free, "std::atomic must be always lock-free"); T* cb_for_constinit_; #endif