diff options
| -rw-r--r-- | absl/log/internal/nullguard.cc | 6 | ||||
| -rw-r--r-- | absl/log/internal/nullguard.h | 6 |
2 files changed, 6 insertions, 6 deletions
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<char, 7> kCharNull{ +ABSL_CONST_INIT ABSL_DLL const std::array<char, 7> kCharNull{ {'(', 'n', 'u', 'l', 'l', ')', '\0'}}; -ABSL_DLL ABSL_CONST_INIT const std::array<signed char, 7> kSignedCharNull{ +ABSL_CONST_INIT ABSL_DLL const std::array<signed char, 7> kSignedCharNull{ {'(', 'n', 'u', 'l', 'l', ')', '\0'}}; -ABSL_DLL ABSL_CONST_INIT const std::array<unsigned char, 7> kUnsignedCharNull{ +ABSL_CONST_INIT ABSL_DLL const std::array<unsigned char, 7> 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<char, 7> kCharNull; -ABSL_DLL ABSL_CONST_INIT extern const std::array<signed char, 7> +ABSL_CONST_INIT ABSL_DLL extern const std::array<char, 7> kCharNull; +ABSL_CONST_INIT ABSL_DLL extern const std::array<signed char, 7> kSignedCharNull; -ABSL_DLL ABSL_CONST_INIT extern const std::array<unsigned char, 7> +ABSL_CONST_INIT ABSL_DLL extern const std::array<unsigned char, 7> kUnsignedCharNull; template <typename T> |