Commit 8fb32dcb authored by gabime's avatar gabime

gcc fixes

parent 6eaf1419
...@@ -17,7 +17,7 @@ int main(int argc, char* argv[]) ...@@ -17,7 +17,7 @@ int main(int argc, char* argv[])
{ {
const unsigned int howmany = argc <= 1 ? 600000 : atoi(argv[1]); const unsigned int howmany = argc <= 1 ? 600000 : atoi(argv[1]);
c11log::set_format("%t"); //c11log::set_format("%t");
auto console = c11log::create<sinks::stdout_sink_st>("reporter"); auto console = c11log::create<sinks::stdout_sink_st>("reporter");
//console->set_format("[%n %l] %t"); //console->set_format("[%n %l] %t");
console->set_level(c11log::level::INFO); console->set_level(c11log::level::INFO);
......
...@@ -16,7 +16,7 @@ details::fast_oss f(const std::string& what) ...@@ -16,7 +16,7 @@ details::fast_oss f(const std::string& what)
oss << what; oss << what;
return oss; return oss;
} }
int main_(int, char* []) int main(int, char* [])
{ {
auto foss = f("test2"); auto foss = f("test2");
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// //
#include "details/line_logger.h" #include "./line_logger.h"
inline c11log::logger::logger(const std::string& logger_name, sinks_init_list sinks_list) : inline c11log::logger::logger(const std::string& logger_name, sinks_init_list sinks_list) :
...@@ -125,7 +125,7 @@ inline void c11log::logger::_log_msg(details::log_msg& msg) ...@@ -125,7 +125,7 @@ inline void c11log::logger::_log_msg(details::log_msg& msg)
// //
// Global registry functions // Global registry functions
// //
#include "details/registry.h" #include "./registry.h"
inline std::shared_ptr<c11log::logger> c11log::get(const std::string& name) inline std::shared_ptr<c11log::logger> c11log::get(const std::string& name)
{ {
return details::registry::instance().get(name); return details::registry::instance().get(name);
...@@ -151,15 +151,9 @@ inline std::shared_ptr<c11log::logger> c11log::create(const std::string& logger_ ...@@ -151,15 +151,9 @@ inline std::shared_ptr<c11log::logger> c11log::create(const std::string& logger_
return details::registry::instance().create(logger_name, std::forward(sinks_begin), std::forward(sinks_end)); return details::registry::instance().create(logger_name, std::forward(sinks_begin), std::forward(sinks_end));
} }
inline void c11log::set_formatter(c11log::formatter_ptr f)
inline void c11log::formatter(c11log::formatter_ptr f)
{
return details::registry::instance().formatter(f);
}
inline c11log::formatter_ptr c11log::formatter()
{ {
return details::registry::instance().formatter(); details::registry::instance().formatter(f);
} }
inline void c11log::set_format(const std::string& format_string) inline void c11log::set_format(const std::string& format_string)
......
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
template<class It> template<class It>
logger(const std::string& name, const It& begin, const It& end); logger(const std::string& name, const It& begin, const It& end);
void c11log::logger::set_format(const std::string& format); void set_format(const std::string&);
void set_formatter(formatter_ptr); void set_formatter(formatter_ptr);
formatter_ptr get_formatter() const; formatter_ptr get_formatter() const;
...@@ -92,8 +92,7 @@ std::shared_ptr<c11log::logger> create(const std::string& logger_name, const Arg ...@@ -92,8 +92,7 @@ std::shared_ptr<c11log::logger> create(const std::string& logger_name, const Arg
template<class It> template<class It>
std::shared_ptr<logger> create(const std::string& logger_name, const It& sinks_begin, const It& sinks_end); std::shared_ptr<logger> create(const std::string& logger_name, const It& sinks_begin, const It& sinks_end);
void formatter(formatter_ptr f); void set_formatter(formatter_ptr f);
formatter_ptr formatter();
void set_format(const std::string& format_string); void set_format(const std::string& format_string);
} }
......
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