Workaround broken [[deprecated]] in Intel compiler (fmtlib#1273)

nd-nuclear-theory · Oct 31, 2019 · 7232412 · 7232412
1 parent 5349646
commit 7232412
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/core.h b/core.h
@@ -132,6 +132,12 @@
 #    endif
 #  endif
 #endif
+// Workaround broken [[deprecated]] in the Intel compiler.
+#ifdef __INTEL_COMPILER
+#  define FMT_DEPRECATED_ALIAS
+#else
+#  define FMT_DEPRECATED_ALIAS FMT_DEPRECATED
+#endif
 
 #ifndef FMT_BEGIN_NAMESPACE
 #  if FMT_HAS_FEATURE(cxx_inline_namespaces) || FMT_GCC_VERSION >= 404 || \
@@ -474,8 +480,8 @@ class basic_parse_context : private ErrorHandler {
 using format_parse_context = basic_parse_context<char>;
 using wformat_parse_context = basic_parse_context<wchar_t>;
 
-using parse_context FMT_DEPRECATED = basic_parse_context<char>;
-using wparse_context FMT_DEPRECATED = basic_parse_context<wchar_t>;
+using parse_context FMT_DEPRECATED_ALIAS = basic_parse_context<char>;
+using wparse_context FMT_DEPRECATED_ALIAS = basic_parse_context<wchar_t>;
 
 template <typename Context> class basic_format_arg;
 template <typename Context> class basic_format_args;

diff --git a/format.h b/format.h
@@ -2595,9 +2595,9 @@ void handle_dynamic_spec(Spec& value, arg_ref<typename Context::char_type> ref,
 }  // namespace internal
 
 template <typename Range>
-using basic_writer FMT_DEPRECATED = internal::basic_writer<Range>;
-using writer FMT_DEPRECATED = internal::writer;
-using wwriter FMT_DEPRECATED =
+using basic_writer FMT_DEPRECATED_ALIAS = internal::basic_writer<Range>;
+using writer FMT_DEPRECATED_ALIAS = internal::writer;
+using wwriter FMT_DEPRECATED_ALIAS =
     internal::basic_writer<internal::buffer_range<wchar_t>>;
 
 /** The default argument formatter. */