From 1fd208995b70f943edc324e7f89ca57a402fa85a Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Thu, 5 Dec 2019 14:58:37 +0100 Subject: Improve syntax and name of compile time variant --- main.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index bea2436..62c55de 100644 --- a/main.cpp +++ b/main.cpp @@ -40,11 +40,12 @@ struct format::AutoConversion> : format::SimpleAutoConversion<' template struct format::AutoConversion, char>>> : format::SimpleAutoConversion<'s', const T(&)[N]> {}; -int main(int argc, char *argv[]) +int main(int, char *[]) { - const std::array array[] = {std::array{1, 2, 3, 4, 5}, std::array{1, 2, 3, 4, 5}, std::array{1, 2, 3, 4, 5}, std::array{1, 2, 3, 4, 5}, std::array{1, 2, 3, 4, 5}}; - std::cout << format::format_s("World", 7, 3.5, &array) << std::endl; - std::cout << format::format("%v%v%v%v%v", 'H', 'e', 'l', 'l', 'o') << std::endl; + constexpr std::array array[] = {std::array{1, 2, 3, 4, 5}, std::array{1, 2, 3, 4, 5}, std::array{1, 2, 3, 4, 5}, std::array{1, 2, 3, 4, 5}, std::array{1, 2, 3, 4, 5}}; + + std::cout << format::format<"Hello %s: %d %03.5f %V">("World", 7, 3.5, array) << std::endl; + std::cout << format::format<"%v%v%v%v%v">('H', 'e', 'l', 'l', 'o') << std::endl; std::cout << format::format("%V", &array) << std::endl; std::cout << format::format("%s", std::array{1, 2, 3, 4, 5}) << std::endl; std::cout << format::format("Hello %v: %-7v %v", "World", 3.5, 5) << std::endl; -- cgit v1.2.3-54-g00ecf