Merge branch 'feature/upstream' into develop

1 files changed, 46 insertions, 0 deletions

diff --git a/lib/spdlog/formatter.h b/lib/spdlog/formatter.h
new file mode 100644
index 0000000..55388ec
--- /dev/null
+++ b/lib/spdlog/formatter.h
@@ -0,0 +1,46 @@
+//
+// Copyright(c) 2015 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#pragma once
+
+#include "details/log_msg.h"
+
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace spdlog {
+namespace details {
+class flag_formatter;
+}
+
+class formatter
+{
+public:
+    virtual ~formatter() = default;
+    virtual void format(details::log_msg &msg) = 0;
+};
+
+class pattern_formatter SPDLOG_FINAL : public formatter
+{
+public:
+    explicit pattern_formatter(const std::string &pattern, pattern_time_type pattern_time = pattern_time_type::local,
+        std::string eol = spdlog::details::os::default_eol);
+    pattern_formatter(const pattern_formatter &) = delete;
+    pattern_formatter &operator=(const pattern_formatter &) = delete;
+    void format(details::log_msg &msg) override;
+
+private:
+    const std::string _eol;
+    const std::string _pattern;
+    const pattern_time_type _pattern_time;
+    std::vector<std::unique_ptr<details::flag_formatter>> _formatters;
+    std::tm get_time(details::log_msg &msg);
+    void handle_flag(char flag);
+    void compile_pattern(const std::string &pattern);
+};
+} // namespace spdlog
+
+#include "details/pattern_formatter_impl.h"