Commit bbf0bada authored by Victor Zverovich's avatar Victor Zverovich

Simplify compile

parent 3730b4f0
...@@ -676,25 +676,11 @@ auto do_compile(const Format& format) ...@@ -676,25 +676,11 @@ auto do_compile(const Format& format)
return preparator<Format, Args...>::prepare(format); return preparator<Format, Args...>::prepare(format);
} }
#endif #endif
} // namespace internal
template <typename... Args> struct prepared_format {
typedef typename internal::basic_prepared_format<
std::string, internal::parts_container<char>, Args...>::type type;
};
template <typename... Args> struct wprepared_format { template <typename... Args> using prepared_format_t =
typedef typename internal::basic_prepared_format< typename basic_prepared_format<
std::wstring, internal::parts_container<wchar_t>, Args...>::type type; std::string, parts_container<char>, Args...>::type;
}; } // namespace internal
template <typename... Args>
using prepared_format_t = typename internal::basic_prepared_format<
std::string, internal::parts_container<char>, Args...>::type;
template <typename... Args>
using wprepared_format_t = typename internal::basic_prepared_format<
std::wstring, internal::parts_container<wchar_t>, Args...>::type;
#if FMT_USE_CONSTEXPR #if FMT_USE_CONSTEXPR
......
...@@ -476,7 +476,7 @@ TEST(PrepareTest, CopyPreparedFormat_InternalStringViewsAreNotInvalidated) { ...@@ -476,7 +476,7 @@ TEST(PrepareTest, CopyPreparedFormat_InternalStringViewsAreNotInvalidated) {
} }
TEST(PrepareTest, ReusedPreparedFormatType) { TEST(PrepareTest, ReusedPreparedFormatType) {
typedef fmt::prepared_format<std::string, int>::type prepared_format; using prepared_format = fmt::internal::prepared_format_t<std::string, int>;
prepared_format prepared = fmt::compile<prepared_format>("The {} is {}."); prepared_format prepared = fmt::compile<prepared_format>("The {} is {}.");
EXPECT_EQ("The answer is 42.", prepared.format("answer", 42)); EXPECT_EQ("The answer is 42.", prepared.format("answer", 42));
......
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