Fixed g++ 4.9 warnings after the clang-tidy fixes
This commit is contained in:
		@@ -35,7 +35,7 @@ class async_logger SPDLOG_FINAL : public logger
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    template<class It>
 | 
					    template<class It>
 | 
				
			||||||
    async_logger(const std::string& name,
 | 
					    async_logger(const std::string& logger_name,
 | 
				
			||||||
                 const It& begin,
 | 
					                 const It& begin,
 | 
				
			||||||
                 const It& end,
 | 
					                 const It& end,
 | 
				
			||||||
                 size_t queue_size,
 | 
					                 size_t queue_size,
 | 
				
			||||||
@@ -44,7 +44,7 @@ public:
 | 
				
			|||||||
                 const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(),
 | 
					                 const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(),
 | 
				
			||||||
                 const std::function<void()>& worker_teardown_cb = nullptr);
 | 
					                 const std::function<void()>& worker_teardown_cb = nullptr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async_logger(const std::string& name,
 | 
					    async_logger(const std::string& logger_name,
 | 
				
			||||||
                 sinks_init_list sinks,
 | 
					                 sinks_init_list sinks,
 | 
				
			||||||
                 size_t queue_size,
 | 
					                 size_t queue_size,
 | 
				
			||||||
                 const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
 | 
					                 const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
 | 
				
			||||||
@@ -52,7 +52,7 @@ public:
 | 
				
			|||||||
                 const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(),
 | 
					                 const std::chrono::milliseconds& flush_interval_ms = std::chrono::milliseconds::zero(),
 | 
				
			||||||
                 const std::function<void()>& worker_teardown_cb = nullptr);
 | 
					                 const std::function<void()>& worker_teardown_cb = nullptr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async_logger(const std::string& name,
 | 
					    async_logger(const std::string& logger_name,
 | 
				
			||||||
                 sink_ptr single_sink,
 | 
					                 sink_ptr single_sink,
 | 
				
			||||||
                 size_t queue_size,
 | 
					                 size_t queue_size,
 | 
				
			||||||
                 const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
 | 
					                 const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@
 | 
				
			|||||||
#include <memory>
 | 
					#include <memory>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
template<class It>
 | 
					template<class It>
 | 
				
			||||||
inline spdlog::async_logger::async_logger(const std::string& name,
 | 
					inline spdlog::async_logger::async_logger(const std::string& logger_name,
 | 
				
			||||||
        const It& begin,
 | 
					        const It& begin,
 | 
				
			||||||
        const It& end,
 | 
					        const It& end,
 | 
				
			||||||
        size_t queue_size,
 | 
					        size_t queue_size,
 | 
				
			||||||
@@ -25,28 +25,28 @@ inline spdlog::async_logger::async_logger(const std::string& name,
 | 
				
			|||||||
        const std::function<void()>& worker_warmup_cb,
 | 
					        const std::function<void()>& worker_warmup_cb,
 | 
				
			||||||
        const std::chrono::milliseconds& flush_interval_ms,
 | 
					        const std::chrono::milliseconds& flush_interval_ms,
 | 
				
			||||||
        const std::function<void()>& worker_teardown_cb) :
 | 
					        const std::function<void()>& worker_teardown_cb) :
 | 
				
			||||||
    logger(name, begin, end),
 | 
					    logger(logger_name, begin, end),
 | 
				
			||||||
    _async_log_helper(new details::async_log_helper(_formatter, _sinks, queue_size, _err_handler, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb))
 | 
					    _async_log_helper(new details::async_log_helper(_formatter, _sinks, queue_size, _err_handler, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb))
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
inline spdlog::async_logger::async_logger(const std::string& name,
 | 
					inline spdlog::async_logger::async_logger(const std::string& logger_name,
 | 
				
			||||||
        sinks_init_list sinks,
 | 
					        sinks_init_list sinks_list,
 | 
				
			||||||
        size_t queue_size,
 | 
					        size_t queue_size,
 | 
				
			||||||
        const async_overflow_policy overflow_policy,
 | 
					        const async_overflow_policy overflow_policy,
 | 
				
			||||||
        const std::function<void()>& worker_warmup_cb,
 | 
					        const std::function<void()>& worker_warmup_cb,
 | 
				
			||||||
        const std::chrono::milliseconds& flush_interval_ms,
 | 
					        const std::chrono::milliseconds& flush_interval_ms,
 | 
				
			||||||
        const std::function<void()>& worker_teardown_cb) :
 | 
					        const std::function<void()>& worker_teardown_cb) :
 | 
				
			||||||
    async_logger(name, sinks.begin(), sinks.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {}
 | 
					    async_logger(logger_name, sinks_list.begin(), sinks_list.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
inline spdlog::async_logger::async_logger(const std::string& name,
 | 
					inline spdlog::async_logger::async_logger(const std::string& logger_name,
 | 
				
			||||||
        sink_ptr single_sink,
 | 
					        sink_ptr single_sink,
 | 
				
			||||||
        size_t queue_size,
 | 
					        size_t queue_size,
 | 
				
			||||||
        const async_overflow_policy overflow_policy,
 | 
					        const async_overflow_policy overflow_policy,
 | 
				
			||||||
        const std::function<void()>& worker_warmup_cb,
 | 
					        const std::function<void()>& worker_warmup_cb,
 | 
				
			||||||
        const std::chrono::milliseconds& flush_interval_ms,
 | 
					        const std::chrono::milliseconds& flush_interval_ms,
 | 
				
			||||||
        const std::function<void()>& worker_teardown_cb) :
 | 
					        const std::function<void()>& worker_teardown_cb) :
 | 
				
			||||||
    async_logger(name,
 | 
					    async_logger(logger_name,
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    std::move(single_sink)
 | 
					    std::move(single_sink)
 | 
				
			||||||
}, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {}
 | 
					}, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb) {}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,8 +14,8 @@
 | 
				
			|||||||
// create logger with given name, sinks and the default pattern formatter
 | 
					// create logger with given name, sinks and the default pattern formatter
 | 
				
			||||||
// all other ctors will call this one
 | 
					// all other ctors will call this one
 | 
				
			||||||
template<class It>
 | 
					template<class It>
 | 
				
			||||||
inline spdlog::logger::logger(std::string name, const It& begin, const It& end):
 | 
					inline spdlog::logger::logger(std::string logger_name, const It& begin, const It& end):
 | 
				
			||||||
    _name(std::move(name)),
 | 
					    _name(std::move(logger_name)),
 | 
				
			||||||
    _sinks(begin, end),
 | 
					    _sinks(begin, end),
 | 
				
			||||||
    _formatter(std::make_shared<pattern_formatter>("%+")),
 | 
					    _formatter(std::make_shared<pattern_formatter>("%+")),
 | 
				
			||||||
    _level(level::info),
 | 
					    _level(level::info),
 | 
				
			||||||
@@ -30,14 +30,14 @@ inline spdlog::logger::logger(std::string name, const It& begin, const It& end):
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ctor with sinks as init list
 | 
					// ctor with sinks as init list
 | 
				
			||||||
inline spdlog::logger::logger(const std::string& name, sinks_init_list sinks):
 | 
					inline spdlog::logger::logger(const std::string& logger_name, sinks_init_list sinks_list):
 | 
				
			||||||
    logger(name, sinks.begin(), sinks.end())
 | 
					    logger(logger_name, sinks_list.begin(), sinks_list.end())
 | 
				
			||||||
{}
 | 
					{}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ctor with single sink
 | 
					// ctor with single sink
 | 
				
			||||||
inline spdlog::logger::logger(const std::string& name, spdlog::sink_ptr single_sink):
 | 
					inline spdlog::logger::logger(const std::string& logger_name, spdlog::sink_ptr single_sink):
 | 
				
			||||||
    logger(name,
 | 
					    logger(logger_name,
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    std::move(single_sink)
 | 
					    std::move(single_sink)
 | 
				
			||||||
})
 | 
					})
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -81,10 +81,10 @@ inline std::tm localtime(const std::time_t &time_tt)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef _WIN32
 | 
					#ifdef _WIN32
 | 
				
			||||||
    std::tm tm {};
 | 
					    std::tm tm;
 | 
				
			||||||
    localtime_s(&tm, &time_tt);
 | 
					    localtime_s(&tm, &time_tt);
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
    std::tm tm {};
 | 
					    std::tm tm;
 | 
				
			||||||
    localtime_r(&time_tt, &tm);
 | 
					    localtime_r(&time_tt, &tm);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
    return tm;
 | 
					    return tm;
 | 
				
			||||||
@@ -100,10 +100,10 @@ inline std::tm gmtime(const std::time_t &time_tt)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef _WIN32
 | 
					#ifdef _WIN32
 | 
				
			||||||
    std::tm tm {};
 | 
					    std::tm tm;
 | 
				
			||||||
    gmtime_s(&tm, &time_tt);
 | 
					    gmtime_s(&tm, &time_tt);
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
    std::tm tm {};
 | 
					    std::tm tm;
 | 
				
			||||||
    gmtime_r(&time_tt, &tm);
 | 
					    gmtime_r(&time_tt, &tm);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
    return tm;
 | 
					    return tm;
 | 
				
			||||||
@@ -219,7 +219,7 @@ inline bool file_exists(const filename_t& filename)
 | 
				
			|||||||
#endif
 | 
					#endif
 | 
				
			||||||
    return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
 | 
					    return (attribs != INVALID_FILE_ATTRIBUTES && !(attribs & FILE_ATTRIBUTE_DIRECTORY));
 | 
				
			||||||
#else //common linux/unix all have the stat system call
 | 
					#else //common linux/unix all have the stat system call
 | 
				
			||||||
    struct stat buffer {};
 | 
					    struct stat buffer;
 | 
				
			||||||
    return (stat(filename.c_str(), &buffer) == 0);
 | 
					    return (stat(filename.c_str(), &buffer) == 0);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -249,11 +249,11 @@ inline size_t filesize(FILE *f)
 | 
				
			|||||||
    int fd = fileno(f);
 | 
					    int fd = fileno(f);
 | 
				
			||||||
    //64 bits(but not in osx or cygwin, where fstat64 is deprecated)
 | 
					    //64 bits(but not in osx or cygwin, where fstat64 is deprecated)
 | 
				
			||||||
#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
 | 
					#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
 | 
				
			||||||
    struct stat64 st {};
 | 
					    struct stat64 st ;
 | 
				
			||||||
    if (fstat64(fd, &st) == 0)
 | 
					    if (fstat64(fd, &st) == 0)
 | 
				
			||||||
        return static_cast<size_t>(st.st_size);
 | 
					        return static_cast<size_t>(st.st_size);
 | 
				
			||||||
#else // unix 32 bits or cygwin
 | 
					#else // unix 32 bits or cygwin
 | 
				
			||||||
    struct stat st {};
 | 
					    struct stat st;
 | 
				
			||||||
    if (fstat(fd, &st) == 0)
 | 
					    if (fstat(fd, &st) == 0)
 | 
				
			||||||
        return static_cast<size_t>(st.st_size);
 | 
					        return static_cast<size_t>(st.st_size);
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user