Commit 744302ad authored by Victor Zverovich's avatar Victor Zverovich

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

parent f5556225
...@@ -132,6 +132,12 @@ ...@@ -132,6 +132,12 @@
# endif # endif
# endif # 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 #ifndef FMT_BEGIN_NAMESPACE
# if FMT_HAS_FEATURE(cxx_inline_namespaces) || FMT_GCC_VERSION >= 404 || \ # if FMT_HAS_FEATURE(cxx_inline_namespaces) || FMT_GCC_VERSION >= 404 || \
...@@ -474,8 +480,8 @@ class basic_parse_context : private ErrorHandler { ...@@ -474,8 +480,8 @@ class basic_parse_context : private ErrorHandler {
using format_parse_context = basic_parse_context<char>; using format_parse_context = basic_parse_context<char>;
using wformat_parse_context = basic_parse_context<wchar_t>; using wformat_parse_context = basic_parse_context<wchar_t>;
using parse_context FMT_DEPRECATED = basic_parse_context<char>; using parse_context FMT_DEPRECATED_ALIAS = basic_parse_context<char>;
using wparse_context FMT_DEPRECATED = basic_parse_context<wchar_t>; using wparse_context FMT_DEPRECATED_ALIAS = basic_parse_context<wchar_t>;
template <typename Context> class basic_format_arg; template <typename Context> class basic_format_arg;
template <typename Context> class basic_format_args; template <typename Context> class basic_format_args;
......
...@@ -2595,9 +2595,9 @@ void handle_dynamic_spec(Spec& value, arg_ref<typename Context::char_type> ref, ...@@ -2595,9 +2595,9 @@ void handle_dynamic_spec(Spec& value, arg_ref<typename Context::char_type> ref,
} // namespace internal } // namespace internal
template <typename Range> template <typename Range>
using basic_writer FMT_DEPRECATED = internal::basic_writer<Range>; using basic_writer FMT_DEPRECATED_ALIAS = internal::basic_writer<Range>;
using writer FMT_DEPRECATED = internal::writer; using writer FMT_DEPRECATED_ALIAS = internal::writer;
using wwriter FMT_DEPRECATED = using wwriter FMT_DEPRECATED_ALIAS =
internal::basic_writer<internal::buffer_range<wchar_t>>; internal::basic_writer<internal::buffer_range<wchar_t>>;
/** The default argument formatter. */ /** The default argument formatter. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment