External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update FMT_USE_NONTYPE_TEMPLATE_PARAMETERS

Browse Source
This commit is contained in:
Alexey Ochapov 2020-12-07 22:35:54 +03:00
parent 6ea2ca8ff4
commit b81bf00c9b
No known key found for this signature in database
GPG Key ID: 9DC52E8F031B8DA8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/fmt/compile.h
View File

@ -13,10 +13,13 @@
#include "format.h" #include "format.h"
#if !defined(FMT_USE_NONTYPE_TEMPLATE_PARAMETERS) && \ #ifndef FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
defined(__cpp_nontype_template_parameter_class) && \ # if defined(__cpp_nontype_template_parameter_class) && \
(!FMT_GCC_VERSION || FMT_GCC_VERSION >= 903) (!FMT_GCC_VERSION || FMT_GCC_VERSION >= 903)
# define FMT_USE_NONTYPE_TEMPLATE_PARAMETERS # define FMT_USE_NONTYPE_TEMPLATE_PARAMETERS 1
# else
# define FMT_USE_NONTYPE_TEMPLATE_PARAMETERS 0
# endif
#endif #endif
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
@ -43,7 +46,7 @@ struct is_compiled_string : std::is_base_of<compiled_string, S> {};
*/ */
#define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::detail::compiled_string) #define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::detail::compiled_string)
#ifdef FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
template <typename Char, size_t N> struct fixed_string { template <typename Char, size_t N> struct fixed_string {
constexpr fixed_string(const Char (&str)[N]) { constexpr fixed_string(const Char (&str)[N]) {
copy_str<Char, const Char*, Char*>(static_cast<const Char*>(str), str + N, copy_str<Char, const Char*, Char*>(static_cast<const Char*>(str), str + N,
@ -725,7 +728,7 @@ size_t formatted_size(const CompiledFormat& cf, const Args&... args) {
return format_to(detail::counting_iterator(), cf, args...).count(); return format_to(detail::counting_iterator(), cf, args...).count();
} }
#ifdef FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
inline namespace literals { inline namespace literals {
template <detail::fixed_string Str> template <detail::fixed_string Str>
constexpr detail::udl_compiled_string<remove_cvref_t<decltype(Str.data[0])>, constexpr detail::udl_compiled_string<remove_cvref_t<decltype(Str.data[0])>,

2
test/compile-test.cc
View File

@ -179,7 +179,7 @@ TEST(CompileTest, Empty) {
} }
#endif #endif
#ifdef FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
TEST(CompileTest, CompileFormatStringLiteral) { TEST(CompileTest, CompileFormatStringLiteral) {
using namespace fmt::literals; using namespace fmt::literals;
EXPECT_EQ("", fmt::format(""_cf)); EXPECT_EQ("", fmt::format(""_cf));