Merge pull request #551 from daylanKifky/modified_includes

modified path on quoted #includes
This commit is contained in:
Gabi Melman 2017-11-11 16:50:06 +02:00 committed by GitHub
commit 63d7c64618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 81 additions and 81 deletions

View File

@ -15,8 +15,8 @@
// 3. will throw spdlog_ex upon log exceptions
// Upon destruction, logs all remaining messages in the queue before destructing..
#include "spdlog/common.h"
#include "spdlog/logger.h"
#include "common.h"
#include "logger.h"
#include <chrono>
#include <functional>
@ -79,4 +79,4 @@ private:
}
#include "spdlog/details/async_logger_impl.h"
#include "details/async_logger_impl.h"

View File

@ -18,7 +18,7 @@
#include <locale>
#endif
#include "spdlog/details/null_mutex.h"
#include "details/null_mutex.h"
//visual studio upto 2013 does not support noexcept nor constexpr
#if defined(_MSC_VER) && (_MSC_VER < 1900)
@ -49,7 +49,7 @@
#define SPDLOG_CATCH_ALL catch (...)
#endif // __linux__
#include "spdlog/fmt/fmt.h"
#include "fmt/fmt.h"
namespace spdlog
{

View File

@ -12,12 +12,12 @@
#pragma once
#include "spdlog/common.h"
#include "spdlog/sinks/sink.h"
#include "spdlog/details/mpmc_bounded_q.h"
#include "spdlog/details/log_msg.h"
#include "spdlog/details/os.h"
#include "spdlog/formatter.h"
#include "../common.h"
#include "../sinks/sink.h"
#include "../details/mpmc_bounded_q.h"
#include "../details/log_msg.h"
#include "../details/os.h"
#include "../formatter.h"
#include <chrono>
#include <exception>

View File

@ -8,8 +8,8 @@
// Async Logger implementation
// Use an async_sink (queue per logger) to perform the logging in a worker thread
#include "spdlog/details/async_log_helper.h"
#include "spdlog/async_logger.h"
#include "../details/async_log_helper.h"
#include "../async_logger.h"
#include <string>
#include <functional>

View File

@ -9,8 +9,8 @@
// When failing to open a file, retry several times(5) with small delay between the tries(10 ms)
// Throw spdlog_ex exception on errors
#include "spdlog/details/os.h"
#include "spdlog/details/log_msg.h"
#include "../details/os.h"
#include "../details/log_msg.h"
#include <chrono>
#include <cstdio>

View File

@ -5,8 +5,8 @@
#pragma once
#include "spdlog/common.h"
#include "spdlog/details/os.h"
#include "../common.h"
#include "../details/os.h"
#include <string>

View File

@ -5,8 +5,8 @@
#pragma once
#include "spdlog/logger.h"
#include "spdlog/sinks/stdout_sinks.h"
#include "../logger.h"
#include "../sinks/stdout_sinks.h"
#include <memory>
#include <string>

View File

@ -43,7 +43,7 @@ Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once
#include "spdlog/common.h"
#include "../common.h"
#include <atomic>
#include <utility>

View File

@ -4,7 +4,7 @@
//
#pragma once
#include "spdlog/common.h"
#include "../common.h"
#include <cstdio>
#include <ctime>

View File

@ -5,10 +5,10 @@
#pragma once
#include "spdlog/formatter.h"
#include "spdlog/details/log_msg.h"
#include "spdlog/details/os.h"
#include "spdlog/fmt/fmt.h"
#include "../formatter.h"
#include "../details/log_msg.h"
#include "../details/os.h"
#include "../fmt/fmt.h"
#include <chrono>
#include <ctime>

View File

@ -10,10 +10,10 @@
// If user requests a non existing logger, nullptr will be returned
// This class is thread safe
#include "spdlog/details/null_mutex.h"
#include "spdlog/logger.h"
#include "spdlog/async_logger.h"
#include "spdlog/common.h"
#include "../details/null_mutex.h"
#include "../logger.h"
#include "../async_logger.h"
#include "../common.h"
#include <chrono>
#include <functional>

View File

@ -8,23 +8,23 @@
//
// Global registry functions
//
#include "spdlog/spdlog.h"
#include "spdlog/details/registry.h"
#include "spdlog/sinks/file_sinks.h"
#include "spdlog/sinks/stdout_sinks.h"
#include "../spdlog.h"
#include "../details/registry.h"
#include "../sinks/file_sinks.h"
#include "../sinks/stdout_sinks.h"
#ifdef SPDLOG_ENABLE_SYSLOG
#include "spdlog/sinks/syslog_sink.h"
#include "../sinks/syslog_sink.h"
#endif
#ifdef _WIN32
#include "spdlog/sinks/wincolor_sink.h"
#include "../sinks/wincolor_sink.h"
#else
#include "spdlog/sinks/ansicolor_sink.h"
#include "../sinks/ansicolor_sink.h"
#endif
#ifdef __ANDROID__
#include "spdlog/sinks/android_sink.h"
#include "../sinks/android_sink.h"
#endif
#include <chrono>

View File

@ -18,9 +18,9 @@
#ifndef FMT_USE_WINDOWS_H
#define FMT_USE_WINDOWS_H 0
#endif
#include "spdlog/fmt/bundled/format.h"
#include "bundled/format.h"
#if defined(SPDLOG_FMT_PRINTF)
#include "spdlog/fmt/bundled/printf.h"
#include "bundled/printf.h"
#endif
#else //external fmtlib

View File

@ -8,8 +8,8 @@
// include external or bundled copy of fmtlib's ostream support
//
#if !defined(SPDLOG_FMT_EXTERNAL)
#include "spdlog/fmt/fmt.h"
#include "spdlog/fmt/bundled/ostream.h"
#include "fmt.h"
#include "bundled/ostream.h"
#else
#include <fmt/ostream.h>
#endif

View File

@ -5,7 +5,7 @@
#pragma once
#include "spdlog/details/log_msg.h"
#include "details/log_msg.h"
#include <vector>
#include <string>
@ -43,5 +43,5 @@ private:
};
}
#include "spdlog/details/pattern_formatter_impl.h"
#include "details/pattern_formatter_impl.h"

View File

@ -12,8 +12,8 @@
// 2. Format the message using the formatter function
// 3. Pass the formatted message to its sinks to performa the actual logging
#include "spdlog/sinks/base_sink.h"
#include "spdlog/common.h"
#include "sinks/base_sink.h"
#include "common.h"
#include <vector>
#include <memory>
@ -132,4 +132,4 @@ protected:
};
}
#include "spdlog/details/logger_impl.h"
#include "details/logger_impl.h"

View File

@ -7,7 +7,7 @@
#if defined(__ANDROID__)
#include "spdlog/sinks/sink.h"
#include "sink.h"
#include <mutex>
#include <string>

View File

@ -5,9 +5,9 @@
#pragma once
#include "spdlog/sinks/base_sink.h"
#include "spdlog/common.h"
#include "spdlog/details/os.h"
#include "base_sink.h"
#include "../common.h"
#include "../details/os.h"
#include <string>
#include <map>

View File

@ -10,10 +10,10 @@
// all locking is taken care of here so no locking needed by the implementers..
//
#include "spdlog/sinks/sink.h"
#include "spdlog/formatter.h"
#include "spdlog/common.h"
#include "spdlog/details/log_msg.h"
#include "sink.h"
#include "../formatter.h"
#include "../common.h"
#include "../details/log_msg.h"
#include <mutex>

View File

@ -5,10 +5,10 @@
#pragma once
#include "spdlog/details/log_msg.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/sinks/base_sink.h"
#include "spdlog/sinks/sink.h"
#include "../details/log_msg.h"
#include "../details/null_mutex.h"
#include "base_sink.h"
#include "sink.h"
#include <algorithm>
#include <mutex>

View File

@ -5,10 +5,10 @@
#pragma once
#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/details/file_helper.h"
#include "spdlog/fmt/fmt.h"
#include "base_sink.h"
#include "../details/null_mutex.h"
#include "../details/file_helper.h"
#include "../fmt/fmt.h"
#include <algorithm>
#include <chrono>

View File

@ -7,8 +7,8 @@
#if defined(_MSC_VER)
#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include "base_sink.h"
#include "../details/null_mutex.h"
#include <WinBase.h>

View File

@ -5,8 +5,8 @@
#pragma once
#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include "base_sink.h"
#include "../details/null_mutex.h"
#include <mutex>

View File

@ -5,8 +5,8 @@
#pragma once
#include "spdlog/details/null_mutex.h"
#include "spdlog/sinks/base_sink.h"
#include "../details/null_mutex.h"
#include "base_sink.h"
#include <ostream>
#include <mutex>

View File

@ -6,7 +6,7 @@
#pragma once
#include "spdlog/details/log_msg.h"
#include "../details/log_msg.h"
namespace spdlog
{

View File

@ -5,8 +5,8 @@
#pragma once
#include "spdlog/details/null_mutex.h"
#include "spdlog/sinks/base_sink.h"
#include "../details/null_mutex.h"
#include "base_sink.h"
#include <cstdio>
#include <memory>

View File

@ -5,12 +5,12 @@
#pragma once
#include "spdlog/common.h"
#include "common.h"
#ifdef SPDLOG_ENABLE_SYSLOG
#include "spdlog/sinks/sink.h"
#include "spdlog/details/log_msg.h"
#include "sink.h"
#include "../details/log_msg.h"
#include <array>
#include <string>

View File

@ -5,9 +5,9 @@
#pragma once
#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include "spdlog/common.h"
#include "base_sink.h"
#include "../details/null_mutex.h"
#include "../common.h"
#include <mutex>
#include <string>

View File

@ -9,9 +9,9 @@
#define SPDLOG_VERSION "0.14.0"
#include "spdlog/tweakme.h"
#include "spdlog/common.h"
#include "spdlog/logger.h"
#include "tweakme.h"
#include "common.h"
#include "logger.h"
#include <memory>
#include <functional>
@ -191,4 +191,4 @@ void drop_all();
}
#include "spdlog/details/spdlog_impl.h"
#include "details/spdlog_impl.h"