cleaned common.h and moved some code around

This commit is contained in:
gabime
2016-05-15 01:45:16 +03:00
parent 10d5292bbb
commit 80a432e646
5 changed files with 31 additions and 33 deletions

View File

@@ -5,7 +5,6 @@
#pragma once
#include <string>
#include <initializer_list>
#include <chrono>
@@ -19,7 +18,6 @@
#include <spdlog/details/null_mutex.h>
//visual studio upto 2013 does not support noexcept nor constexpr
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define SPDLOG_NOEXCEPT throw()
@@ -30,7 +28,6 @@
#endif
namespace spdlog
{
@@ -41,7 +38,6 @@ namespace sinks
class sink;
}
// Common types across the lib
using log_clock = std::chrono::system_clock;
using sink_ptr = std::shared_ptr < sinks::sink >;
using sinks_init_list = std::initializer_list < sink_ptr >;
@@ -115,21 +111,10 @@ private:
// wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
//
#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
#define SPDLOG_FILENAME_T(s) L ## s
using filename_t = std::wstring;
inline std::string filename_to_str(const filename_t& filename)
{
std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> c;
return c.to_bytes(filename);
}
#else
#define SPDLOG_FILENAME_T(s) s
using filename_t = std::string;
inline std::string filename_to_str(const filename_t& filename)
{
return filename;
}
#endif
} //spdlog