From 4ae8771a314abe8b0e85cee3be3ead30451c63e7 Mon Sep 17 00:00:00 2001 From: Derek Mauro Date: Wed, 1 Mar 2023 21:29:34 -0800 Subject: Change from `ABSL_DLL ABSL_CONST_INIT` to `ABSL_CONST_INIT ABSL_DLL` This avoids "error: an attribute list cannot appear here" PiperOrigin-RevId: 513430681 Change-Id: I0fd31771793ee4cb66149ef4ce3e3e064dfb260d --- absl/log/internal/nullguard.cc | 6 +++--- absl/log/internal/nullguard.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'absl/log') diff --git a/absl/log/internal/nullguard.cc b/absl/log/internal/nullguard.cc index 4f2f9d40..3296c014 100644 --- a/absl/log/internal/nullguard.cc +++ b/absl/log/internal/nullguard.cc @@ -23,11 +23,11 @@ namespace absl { ABSL_NAMESPACE_BEGIN namespace log_internal { -ABSL_DLL ABSL_CONST_INIT const std::array kCharNull{ +ABSL_CONST_INIT ABSL_DLL const std::array kCharNull{ {'(', 'n', 'u', 'l', 'l', ')', '\0'}}; -ABSL_DLL ABSL_CONST_INIT const std::array kSignedCharNull{ +ABSL_CONST_INIT ABSL_DLL const std::array kSignedCharNull{ {'(', 'n', 'u', 'l', 'l', ')', '\0'}}; -ABSL_DLL ABSL_CONST_INIT const std::array kUnsignedCharNull{ +ABSL_CONST_INIT ABSL_DLL const std::array kUnsignedCharNull{ {'(', 'n', 'u', 'l', 'l', ')', '\0'}}; } // namespace log_internal diff --git a/absl/log/internal/nullguard.h b/absl/log/internal/nullguard.h index 926f61bb..623943c5 100644 --- a/absl/log/internal/nullguard.h +++ b/absl/log/internal/nullguard.h @@ -34,10 +34,10 @@ namespace absl { ABSL_NAMESPACE_BEGIN namespace log_internal { -ABSL_DLL ABSL_CONST_INIT extern const std::array kCharNull; -ABSL_DLL ABSL_CONST_INIT extern const std::array +ABSL_CONST_INIT ABSL_DLL extern const std::array kCharNull; +ABSL_CONST_INIT ABSL_DLL extern const std::array kSignedCharNull; -ABSL_DLL ABSL_CONST_INIT extern const std::array +ABSL_CONST_INIT ABSL_DLL extern const std::array kUnsignedCharNull; template -- cgit v1.2.3