Commit ebce9794 authored by gabime's avatar gabime

use make_unique

parent f4bbe8b2
...@@ -174,4 +174,17 @@ using filename_t = std::string; ...@@ -174,4 +174,17 @@ using filename_t = std::string;
{ \ { \
err_handler_("Unknown exeption in logger"); \ err_handler_("Unknown exeption in logger"); \
} }
//
// make_unique support
//
#if __cplusplus >= 201402L // C++14 and beyond
using std::make_unique;
#else
template<typename T, typename... Args>
std::unique_ptr<T> make_unique(Args &&... args)
{
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
#endif
} // namespace spdlog } // namespace spdlog
...@@ -547,7 +547,7 @@ public: ...@@ -547,7 +547,7 @@ public:
std::unique_ptr<formatter> clone() const override std::unique_ptr<formatter> clone() const override
{ {
return std::unique_ptr<formatter>(new pattern_formatter(pattern_, pattern_time_type_, eol_)); return spdlog::make_unique<pattern_formatter>(pattern_, pattern_time_type_, eol_);
} }
void format(const details::log_msg &msg, fmt::memory_buffer &dest) override void format(const details::log_msg &msg, fmt::memory_buffer &dest) override
...@@ -588,146 +588,145 @@ private: ...@@ -588,146 +588,145 @@ private:
void handle_flag_(char flag) void handle_flag_(char flag)
{ {
using flag_formatter_ptr = std::unique_ptr<details::flag_formatter>;
switch (flag) switch (flag)
{ {
// logger name // logger name
case 'n': case 'n':
formatters_.push_back(flag_formatter_ptr(new details::name_formatter())); formatters_.push_back(make_unique<details::name_formatter>());
break; break;
case 'l': case 'l':
formatters_.push_back(flag_formatter_ptr(new details::level_formatter())); formatters_.push_back(make_unique<details::level_formatter>());
break; break;
case 'L': case 'L':
formatters_.push_back(flag_formatter_ptr(new details::short_level_formatter())); formatters_.push_back(make_unique<details::short_level_formatter>());
break; break;
case ('t'): case ('t'):
formatters_.push_back(flag_formatter_ptr(new details::t_formatter())); formatters_.push_back(make_unique<details::t_formatter>());
break; break;
case ('v'): case ('v'):
formatters_.push_back(flag_formatter_ptr(new details::v_formatter())); formatters_.push_back(make_unique<details::v_formatter>());
break; break;
case ('a'): case ('a'):
formatters_.push_back(flag_formatter_ptr(new details::a_formatter())); formatters_.push_back(make_unique<details::a_formatter>());
break; break;
case ('A'): case ('A'):
formatters_.push_back(flag_formatter_ptr(new details::A_formatter())); formatters_.push_back(make_unique<details::A_formatter>());
break; break;
case ('b'): case ('b'):
case ('h'): case ('h'):
formatters_.push_back(flag_formatter_ptr(new details::b_formatter())); formatters_.push_back(make_unique<details::b_formatter>());
break; break;
case ('B'): case ('B'):
formatters_.push_back(flag_formatter_ptr(new details::B_formatter())); formatters_.push_back(make_unique<details::B_formatter>());
break; break;
case ('c'): case ('c'):
formatters_.push_back(flag_formatter_ptr(new details::c_formatter())); formatters_.push_back(make_unique<details::c_formatter>());
break; break;
case ('C'): case ('C'):
formatters_.push_back(flag_formatter_ptr(new details::C_formatter())); formatters_.push_back(make_unique<details::C_formatter>());
break; break;
case ('Y'): case ('Y'):
formatters_.push_back(flag_formatter_ptr(new details::Y_formatter())); formatters_.push_back(make_unique<details::Y_formatter>());
break; break;
case ('D'): case ('D'):
case ('x'): case ('x'):
formatters_.push_back(flag_formatter_ptr(new details::D_formatter())); formatters_.push_back(make_unique<details::D_formatter>());
break; break;
case ('m'): case ('m'):
formatters_.push_back(flag_formatter_ptr(new details::m_formatter())); formatters_.push_back(make_unique<details::m_formatter>());
break; break;
case ('d'): case ('d'):
formatters_.push_back(flag_formatter_ptr(new details::d_formatter())); formatters_.push_back(make_unique<details::d_formatter>());
break; break;
case ('H'): case ('H'):
formatters_.push_back(flag_formatter_ptr(new details::H_formatter())); formatters_.push_back(make_unique<details::H_formatter>());
break; break;
case ('I'): case ('I'):
formatters_.push_back(flag_formatter_ptr(new details::I_formatter())); formatters_.push_back(make_unique<details::I_formatter>());
break; break;
case ('M'): case ('M'):
formatters_.push_back(flag_formatter_ptr(new details::M_formatter())); formatters_.push_back(make_unique<details::M_formatter>());
break; break;
case ('S'): case ('S'):
formatters_.push_back(flag_formatter_ptr(new details::S_formatter())); formatters_.push_back(make_unique<details::S_formatter>());
break; break;
case ('e'): case ('e'):
formatters_.push_back(flag_formatter_ptr(new details::e_formatter())); formatters_.push_back(make_unique<details::e_formatter>());
break; break;
case ('f'): case ('f'):
formatters_.push_back(flag_formatter_ptr(new details::f_formatter())); formatters_.push_back(make_unique<details::f_formatter>());
break; break;
case ('F'): case ('F'):
formatters_.push_back(flag_formatter_ptr(new details::F_formatter())); formatters_.push_back(make_unique<details::F_formatter>());
break; break;
case ('E'): case ('E'):
formatters_.push_back(flag_formatter_ptr(new details::E_formatter())); formatters_.push_back(make_unique<details::E_formatter>());
break; break;
case ('p'): case ('p'):
formatters_.push_back(flag_formatter_ptr(new details::p_formatter())); formatters_.push_back(make_unique<details::p_formatter>());
break; break;
case ('r'): case ('r'):
formatters_.push_back(flag_formatter_ptr(new details::r_formatter())); formatters_.push_back(make_unique<details::r_formatter>());
break; break;
case ('R'): case ('R'):
formatters_.push_back(flag_formatter_ptr(new details::R_formatter())); formatters_.push_back(make_unique<details::R_formatter>());
break; break;
case ('T'): case ('T'):
case ('X'): case ('X'):
formatters_.push_back(flag_formatter_ptr(new details::T_formatter())); formatters_.push_back(make_unique<details::T_formatter>());
break; break;
case ('z'): case ('z'):
formatters_.push_back(flag_formatter_ptr(new details::z_formatter())); formatters_.push_back(make_unique<details::z_formatter>());
break; break;
case ('+'): case ('+'):
formatters_.push_back(flag_formatter_ptr(new details::full_formatter())); formatters_.push_back(make_unique<details::full_formatter>());
break; break;
case ('P'): case ('P'):
formatters_.push_back(flag_formatter_ptr(new details::pid_formatter())); formatters_.push_back(make_unique<details::pid_formatter>());
break; break;
case ('i'): case ('i'):
formatters_.push_back(flag_formatter_ptr(new details::i_formatter())); formatters_.push_back(make_unique<details::i_formatter>());
break; break;
case ('^'): case ('^'):
formatters_.push_back(flag_formatter_ptr(new details::color_start_formatter())); formatters_.push_back(make_unique<details::color_start_formatter>());
break; break;
case ('$'): case ('$'):
formatters_.push_back(flag_formatter_ptr(new details::color_stop_formatter())); formatters_.push_back(make_unique<details::color_stop_formatter>());
break; break;
default: // Unknown flag appears as is default: // Unknown flag appears as is
formatters_.push_back(flag_formatter_ptr(new details::ch_formatter('%'))); formatters_.push_back(make_unique<details::ch_formatter>('%'));
formatters_.push_back(flag_formatter_ptr(new details::ch_formatter(flag))); formatters_.push_back(make_unique<details::ch_formatter>(flag));
break; break;
} }
} }
...@@ -758,7 +757,7 @@ private: ...@@ -758,7 +757,7 @@ private:
{ {
if (!user_chars) if (!user_chars)
{ {
user_chars = std::unique_ptr<details::aggregate_formatter>(new details::aggregate_formatter()); user_chars = spdlog::make_unique<details::aggregate_formatter>();
} }
user_chars->add_ch(*it); user_chars->add_ch(*it);
} }
......
...@@ -113,7 +113,7 @@ public: ...@@ -113,7 +113,7 @@ public:
{ {
std::lock_guard<std::mutex> lock(flusher_mutex_); std::lock_guard<std::mutex> lock(flusher_mutex_);
std::function<void()> clbk = std::bind(&registry::flush_all, this); std::function<void()> clbk = std::bind(&registry::flush_all, this);
periodic_flusher_.reset(new periodic_worker(clbk, interval)); periodic_flusher_ = make_unique<periodic_worker>(clbk, interval);
} }
void set_error_handler(log_err_handler handler) void set_error_handler(log_err_handler handler)
......
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