From 8fb32dcb65dcfafc413063ed5f1c47d842c0d9af Mon Sep 17 00:00:00 2001
From: gabime <galim120@bezeqint.net>
Date: Sat, 25 Oct 2014 00:44:02 +0300
Subject: [PATCH] gcc fixes

---
 example/bench.cpp                    |  2 +-
 example/example.cpp                  |  2 +-
 include/c11log/details/logger_impl.h | 14 ++++----------
 include/c11log/logger.h              |  7 +++----
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/example/bench.cpp b/example/bench.cpp
index 807cb2c3..44af771e 100644
--- a/example/bench.cpp
+++ b/example/bench.cpp
@@ -17,7 +17,7 @@ int main(int argc, char* argv[])
 {
     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");
     //console->set_format("[%n %l] %t");
     console->set_level(c11log::level::INFO);
diff --git a/example/example.cpp b/example/example.cpp
index c9b0ae50..6d9d00d3 100644
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -16,7 +16,7 @@ details::fast_oss f(const std::string& what)
     oss << what;
     return oss;
 }
-int main_(int, char* [])
+int main(int, char* [])
 {
 
     auto foss = f("test2");
diff --git a/include/c11log/details/logger_impl.h b/include/c11log/details/logger_impl.h
index aca750a8..03474c5d 100644
--- a/include/c11log/details/logger_impl.h
+++ b/include/c11log/details/logger_impl.h
@@ -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) :
@@ -125,7 +125,7 @@ inline void c11log::logger::_log_msg(details::log_msg& msg)
 //
 // Global registry functions
 //
-#include "details/registry.h"
+#include "./registry.h"
 inline std::shared_ptr<c11log::logger> c11log::get(const std::string& name)
 {
     return details::registry::instance().get(name);
@@ -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));
 }
 
-
-inline void c11log::formatter(c11log::formatter_ptr f)
+inline void c11log::set_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)
diff --git a/include/c11log/logger.h b/include/c11log/logger.h
index c43c3782..3e4ab370 100644
--- a/include/c11log/logger.h
+++ b/include/c11log/logger.h
@@ -31,7 +31,7 @@ public:
     template<class It>
     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);
     formatter_ptr get_formatter() const;
 
@@ -92,8 +92,7 @@ std::shared_ptr<c11log::logger> create(const std::string& logger_name, const Arg
 template<class It>
 std::shared_ptr<logger> create(const std::string& logger_name, const It& sinks_begin, const It& sinks_end);
 
-void formatter(formatter_ptr f);
-formatter_ptr formatter();
+void set_formatter(formatter_ptr f);
 void set_format(const std::string& format_string);
 }
 
@@ -112,4 +111,4 @@ void set_format(const std::string& format_string);
 #define FFLOG_DEBUG(logger, ...) {}
 #endif
 
-#include "./details/logger_impl.h"
\ No newline at end of file
+#include "./details/logger_impl.h"