From ef665e959f35e5c4a26217f13501dad7cdf8e741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Thu, 16 Feb 2017 13:17:13 +0100 Subject: [PATCH] Don't deduce return types for days / months Required for C++11 support --- .../spdlog/details/pattern_formatter_impl.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/include/spdlog/details/pattern_formatter_impl.h b/include/spdlog/details/pattern_formatter_impl.h index 95082022..07895485 100644 --- a/include/spdlog/details/pattern_formatter_impl.h +++ b/include/spdlog/details/pattern_formatter_impl.h @@ -79,8 +79,9 @@ static int to12h(const tm& t) } //Abbreviated weekday name -static const auto& days() { - static const std::array arr{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; +using days_array = std::array; +static const days_array& days() { + static const days_array arr{ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; return arr; } class a_formatter:public flag_formatter @@ -92,8 +93,8 @@ class a_formatter:public flag_formatter }; //Full weekday name -static const auto& full_days() { - static const std::array arr{ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; +static const days_array& full_days() { + static const days_array arr{ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; return arr; } class A_formatter:public flag_formatter @@ -105,8 +106,9 @@ class A_formatter:public flag_formatter }; //Abbreviated month -static const auto& months() { - static const std::array arr{ "Jan", "Feb", "Mar", "Apr", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec" }; +using months_array = std::array; +static const months_array& months() { + static const months_array arr{ "Jan", "Feb", "Mar", "Apr", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec" }; return arr; } class b_formatter:public flag_formatter @@ -118,8 +120,8 @@ class b_formatter:public flag_formatter }; //Full month name -static const auto& full_months() { - static const std::array arr{ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; +static const months_array& full_months() { + static const months_array arr{ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; return arr; } class B_formatter:public flag_formatter