TeaSpeak
/
spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use emplace_back in pattern_formatter

This commit is contained in:
gabime 2018-02-23 14:05:48 +02:00
parent bdca50e6a7
commit 6df52df5b4
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
include/spdlog/details/pattern_formatter_impl.h
View File

@ -502,8 +502,7 @@ inline void spdlog::pattern_formatter::compile_pattern(const std::string& patter
if (*it == '%') if (*it == '%')
{ {
if (user_chars) //append user chars found so far if (user_chars) //append user chars found so far
_formatters.push_back(std::move(user_chars)); _formatters.push_back(std::move(user_chars));
if (++it != end) if (++it != end)
handle_flag(*it); handle_flag(*it);
else else
@ -527,136 +526,136 @@ inline void spdlog::pattern_formatter::handle_flag(char flag)
switch (flag) switch (flag)
{ {
// logger name // logger name
case 'n': case 'n':
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::name_formatter())); _formatters.emplace_back(new details::name_formatter());
break; break;
case 'l': case 'l':
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::level_formatter())); _formatters.emplace_back(new details::level_formatter());
break; break;
case 'L': case 'L':
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::short_level_formatter())); _formatters.emplace_back(new details::short_level_formatter());
break; break;
case('t'): case('t'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::t_formatter())); _formatters.emplace_back(new details::t_formatter());
break; break;
case('v'): case('v'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::v_formatter())); _formatters.emplace_back(new details::v_formatter());
break; break;
case('a'): case('a'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::a_formatter())); _formatters.emplace_back(new details::a_formatter());
break; break;
case('A'): case('A'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::A_formatter())); _formatters.emplace_back(new details::A_formatter());
break; break;
case('b'): case('b'):
case('h'): case('h'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::b_formatter())); _formatters.emplace_back(new details::b_formatter());
break; break;
case('B'): case('B'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::B_formatter())); _formatters.emplace_back(new details::B_formatter());
break; break;
case('c'): case('c'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::c_formatter())); _formatters.emplace_back(new details::c_formatter());
break; break;
case('C'): case('C'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::C_formatter())); _formatters.emplace_back(new details::C_formatter());
break; break;
case('Y'): case('Y'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::Y_formatter())); _formatters.emplace_back(new details::Y_formatter());
break; break;
case('D'): case('D'):
case('x'): case('x'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::D_formatter())); _formatters.emplace_back(new details::D_formatter());
break; break;
case('m'): case('m'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::m_formatter())); _formatters.emplace_back(new details::m_formatter());
break; break;
case('d'): case('d'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::d_formatter())); _formatters.emplace_back(new details::d_formatter());
break; break;
case('H'): case('H'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::H_formatter())); _formatters.emplace_back(new details::H_formatter());
break; break;
case('I'): case('I'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::I_formatter())); _formatters.emplace_back(new details::I_formatter());
break; break;
case('M'): case('M'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::M_formatter())); _formatters.emplace_back(new details::M_formatter());
break; break;
case('S'): case('S'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::S_formatter())); _formatters.emplace_back(new details::S_formatter());
break; break;
case('e'): case('e'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::e_formatter())); _formatters.emplace_back(new details::e_formatter());
break; break;
case('f'): case('f'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::f_formatter())); _formatters.emplace_back(new details::f_formatter());
break; break;
case('F'): case('F'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::F_formatter())); _formatters.emplace_back(new details::F_formatter());
break; break;
case('E'): case('E'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::E_formatter())); _formatters.emplace_back(new details::E_formatter());
break; break;
case('p'): case('p'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::p_formatter())); _formatters.emplace_back(new details::p_formatter());
break; break;
case('r'): case('r'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::r_formatter())); _formatters.emplace_back(new details::r_formatter());
break; break;
case('R'): case('R'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::R_formatter())); _formatters.emplace_back(new details::R_formatter());
break; break;
case('T'): case('T'):
case('X'): case('X'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::T_formatter())); _formatters.emplace_back(new details::T_formatter());
break; break;
case('z'): case('z'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::z_formatter())); _formatters.emplace_back(new details::z_formatter());
break; break;
case ('+'): case ('+'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::full_formatter())); _formatters.emplace_back(new details::full_formatter());
break; break;
case ('P'): case ('P'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::pid_formatter())); _formatters.emplace_back(new details::pid_formatter());
break; break;
case ('i'): case ('i'):
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::i_formatter())); _formatters.emplace_back(new details::i_formatter());
break; break;
default: //Unknown flag appears as is default: //Unknown flag appears as is
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::ch_formatter('%'))); _formatters.emplace_back(new details::ch_formatter('%'));
_formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::ch_formatter(flag))); _formatters.emplace_back(new details::ch_formatter(flag));
break; break;
} }
} }