Use base_internal::AtomicHook instead of std::atomic (#661)
* Use base_internal::AtomicHook instead of std::atomic std::atomic has a broken implementation on the Windows platform and it is not conform to the ABSL_CONST_INIT macro when clang-cl is used as a compiler: the macro is expanded to the [[clang::require_constant_initialization]] attribute and the attribute cannot be applied to the broken std::atomic. Therefore, std::atomic has been replaced with absl::base_internal::AtomicHook to fix the compilation error (thank Derek Mauro for the suggestion). Issue: #659 Signed-off-by: Pavel Samolysov <samolisov@gmail.com> * Update build files for pull request Co-authored-by: Derek Mauro <dmauro@google.com>
This commit is contained in:
parent
567bee2f73
commit
2946ac0dea
3 changed files with 7 additions and 10 deletions
|
@ -16,26 +16,21 @@
|
|||
#include <atomic>
|
||||
|
||||
#include "absl/base/attributes.h"
|
||||
#include "absl/base/internal/atomic_hook.h"
|
||||
|
||||
namespace absl {
|
||||
ABSL_NAMESPACE_BEGIN
|
||||
namespace status_internal {
|
||||
|
||||
namespace {
|
||||
// Tried constant initialized global variable but it doesn't work with Lexan
|
||||
// (MSVC's `std::atomic` has trouble constant initializing).
|
||||
std::atomic<StatusPayloadPrinter>& GetStatusPayloadPrinterStorage() {
|
||||
ABSL_CONST_INIT static std::atomic<StatusPayloadPrinter> instance{nullptr};
|
||||
return instance;
|
||||
}
|
||||
} // namespace
|
||||
ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES
|
||||
static absl::base_internal::AtomicHook<StatusPayloadPrinter> storage;
|
||||
|
||||
void SetStatusPayloadPrinter(StatusPayloadPrinter printer) {
|
||||
GetStatusPayloadPrinterStorage().store(printer, std::memory_order_relaxed);
|
||||
storage.Store(printer);
|
||||
}
|
||||
|
||||
StatusPayloadPrinter GetStatusPayloadPrinter() {
|
||||
return GetStatusPayloadPrinterStorage().load(std::memory_order_relaxed);
|
||||
return storage.Load();
|
||||
}
|
||||
|
||||
} // namespace status_internal
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue