From 4189a406f46cce97786c145951e47faf150d6104 Mon Sep 17 00:00:00 2001 From: gabime Date: Sat, 22 Mar 2014 13:48:53 +0200 Subject: [PATCH] git ignore --- .gitignore | 36 ++++++++++++++++++++++++++++ example/example.cpp | 1 + include/c11log/details/line_logger.h | 3 ++- include/c11log/logger.h | 5 ++-- 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..6c04147d --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +# Codelite +.codelite + +# .orig files +*.orig + +# example files +example/* +!example/example.cpp +!example/utils.h +!example/makefile +!example/makefile.clang + + diff --git a/example/example.cpp b/example/example.cpp index 744a5ca9..63acb71a 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -6,6 +6,7 @@ #include "c11log/sinks/async_sink.h" #include "c11log/sinks/file_sinks.h" #include "c11log/sinks/console_sinks.h" +#include "c11log/details/log_msg.h" #include "utils.h" diff --git a/include/c11log/details/line_logger.h b/include/c11log/details/line_logger.h index 2424551a..270901a3 100644 --- a/include/c11log/details/line_logger.h +++ b/include/c11log/details/line_logger.h @@ -32,6 +32,7 @@ public: _oss); } } + // No copy intended. Only move line_logger(const line_logger& other) = delete; line_logger& operator=(const line_logger&) = delete; @@ -65,7 +66,7 @@ public: private: logger* _callback_logger; - details::fast_oss _oss; + details::fast_oss _oss; level::level_enum _level; bool _enabled; diff --git a/include/c11log/logger.h b/include/c11log/logger.h index 2d7f01c7..d6104594 100644 --- a/include/c11log/logger.h +++ b/include/c11log/logger.h @@ -11,6 +11,7 @@ #include "common_types.h" #include "sinks/base_sink.h" #include "details/factory.h" +#include "c11log/details/log_msg.h" //Thread safe, fast logger. @@ -101,8 +102,8 @@ inline c11log::logger::logger(sinks_init_list sinks_list) : inline c11log::details::line_logger c11log::logger::log(c11log::level::level_enum msg_level) -{ - return details::line_logger(this, msg_level, msg_level >= _atomic_level); +{ + return details::line_logger(this, new_log_msg, msg_level >= msg_level); } inline c11log::details::line_logger c11log::logger::debug()