From 634f707f2bddf25d90311cd56d81a4c9706aaf3b Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Fri, 31 May 2019 18:34:12 -0700 Subject: [PATCH] Simplify char_t and remove msvc2013 from CI --- doc/index.rst | 3 ++- include/fmt/core.h | 9 +-------- support/appveyor.yml | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/doc/index.rst b/doc/index.rst index 57140d66..9480ff69 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -175,8 +175,9 @@ The library is highly portable and relies only on a small set of C++11 features: * decltype * trailing return types * deleted functions +* alias templates -These are available since GCC 4.4, Clang 2.9 and MSVC 18.0 (2013). For older +These are available since GCC 4.8, Clang 3.0 and MSVC 19.0 (2015). For older compilers use fmt `version 4.x `_ which continues to be maintained and only requires C++98. diff --git a/include/fmt/core.h b/include/fmt/core.h index 9e06a2d9..8df1f8aa 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -1306,16 +1306,9 @@ struct wformat_args : basic_format_args { : basic_format_args(std::forward(arg)...) {} }; -#ifndef FMT_USE_ALIAS_TEMPLATES -# define FMT_USE_ALIAS_TEMPLATES FMT_HAS_FEATURE(cxx_alias_templates) -#endif -#if FMT_USE_ALIAS_TEMPLATES /** String's character type. */ template using char_t = typename internal::char_t::type; -# define FMT_CHAR(S) fmt::char_t -#else -# define FMT_CHAR(S) typename internal::char_t::type -#endif +#define FMT_CHAR(S) fmt::char_t namespace internal { template diff --git a/support/appveyor.yml b/support/appveyor.yml index af298cf7..525cbe0e 100644 --- a/support/appveyor.yml +++ b/support/appveyor.yml @@ -9,7 +9,6 @@ platform: - x64 image: - - Visual Studio 2013 - Visual Studio 2015 - Visual Studio 2017