Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x

This commit is contained in:
gabime 2019-06-27 17:41:17 +03:00
commit cf152e6030
4 changed files with 4 additions and 1 deletions

View File

@ -20,7 +20,7 @@ protected:
void flush_() override {} void flush_() override {}
}; };
using null_sink_mt = null_sink<std::mutex>; using null_sink_mt = null_sink<details::null_mutex>;
using null_sink_st = null_sink<details::null_mutex>; using null_sink_st = null_sink<details::null_mutex>;
} // namespace sinks } // namespace sinks

View File

@ -5,6 +5,7 @@
#include "spdlog/sinks/base_sink.h" #include "spdlog/sinks/base_sink.h"
#include "spdlog/details/file_helper.h" #include "spdlog/details/file_helper.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/details/synchronous_factory.h" #include "spdlog/details/synchronous_factory.h"
#include <chrono> #include <chrono>

View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include "spdlog/sinks/base_sink.h" #include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include <array> #include <array>
#include <string> #include <string>

View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include "spdlog/sinks/base_sink.h" #include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/details/synchronous_factory.h" #include "spdlog/details/synchronous_factory.h"
#include <array> #include <array>