Commit 27e74126 authored by daylanKifky's avatar daylanKifky

modified path on quoted #includes

Paths pointing to the root of the library where replaced for ones relatives to each file.

For example, inside /include/spdlog/details/file_helper.h:

This will look for os.h in /include/spdlog/details/spdlog/details/ which doesn't exists.

replaced with:
parent 93be7713
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
// 3. will throw spdlog_ex upon log exceptions // 3. will throw spdlog_ex upon log exceptions
// Upon destruction, logs all remaining messages in the queue before destructing.. // Upon destruction, logs all remaining messages in the queue before destructing..
#include "spdlog/common.h" #include "common.h"
#include "spdlog/logger.h" #include "logger.h"
#include <chrono> #include <chrono>
#include <functional> #include <functional>
...@@ -79,4 +79,4 @@ private: ...@@ -79,4 +79,4 @@ private:
} }
#include "spdlog/details/async_logger_impl.h" #include "details/async_logger_impl.h"
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <locale> #include <locale>
#endif #endif
#include "spdlog/details/null_mutex.h" #include "details/null_mutex.h"
//visual studio upto 2013 does not support noexcept nor constexpr //visual studio upto 2013 does not support noexcept nor constexpr
#if defined(_MSC_VER) && (_MSC_VER < 1900) #if defined(_MSC_VER) && (_MSC_VER < 1900)
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#define SPDLOG_CATCH_ALL catch (...) #define SPDLOG_CATCH_ALL catch (...)
#endif // __linux__ #endif // __linux__
#include "spdlog/fmt/fmt.h" #include "fmt/fmt.h"
namespace spdlog namespace spdlog
{ {
......
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
#pragma once #pragma once
#include "spdlog/common.h" #include "../common.h"
#include "spdlog/sinks/sink.h" #include "../sinks/sink.h"
#include "spdlog/details/mpmc_bounded_q.h" #include "../details/mpmc_bounded_q.h"
#include "spdlog/details/log_msg.h" #include "../details/log_msg.h"
#include "spdlog/details/os.h" #include "../details/os.h"
#include "spdlog/formatter.h" #include "../formatter.h"
#include <chrono> #include <chrono>
#include <exception> #include <exception>
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
// Async Logger implementation // Async Logger implementation
// Use an async_sink (queue per logger) to perform the logging in a worker thread // Use an async_sink (queue per logger) to perform the logging in a worker thread
#include "spdlog/details/async_log_helper.h" #include "../details/async_log_helper.h"
#include "spdlog/async_logger.h" #include "../async_logger.h"
#include <string> #include <string>
#include <functional> #include <functional>
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
// When failing to open a file, retry several times(5) with small delay between the tries(10 ms) // When failing to open a file, retry several times(5) with small delay between the tries(10 ms)
// Throw spdlog_ex exception on errors // Throw spdlog_ex exception on errors
#include "spdlog/details/os.h" #include "../details/os.h"
#include "spdlog/details/log_msg.h" #include "../details/log_msg.h"
#include <chrono> #include <chrono>
#include <cstdio> #include <cstdio>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#pragma once #pragma once
#include "spdlog/common.h" #include "../common.h"
#include "spdlog/details/os.h" #include "../details/os.h"
#include <string> #include <string>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#pragma once #pragma once
#include "spdlog/logger.h" #include "../logger.h"
#include "spdlog/sinks/stdout_sinks.h" #include "../sinks/stdout_sinks.h"
#include <memory> #include <memory>
#include <string> #include <string>
......
...@@ -43,7 +43,7 @@ Distributed under the MIT License (http://opensource.org/licenses/MIT) ...@@ -43,7 +43,7 @@ Distributed under the MIT License (http://opensource.org/licenses/MIT)
#pragma once #pragma once
#include "spdlog/common.h" #include "../common.h"
#include <atomic> #include <atomic>
#include <utility> #include <utility>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// //
#pragma once #pragma once
#include "spdlog/common.h" #include "../common.h"
#include <cstdio> #include <cstdio>
#include <ctime> #include <ctime>
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
#pragma once #pragma once
#include "spdlog/formatter.h" #include "../formatter.h"
#include "spdlog/details/log_msg.h" #include "../details/log_msg.h"
#include "spdlog/details/os.h" #include "../details/os.h"
#include "spdlog/fmt/fmt.h" #include "../fmt/fmt.h"
#include <chrono> #include <chrono>
#include <ctime> #include <ctime>
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
// If user requests a non existing logger, nullptr will be returned // If user requests a non existing logger, nullptr will be returned
// This class is thread safe // This class is thread safe
#include "spdlog/details/null_mutex.h" #include "../details/null_mutex.h"
#include "spdlog/logger.h" #include "../logger.h"
#include "spdlog/async_logger.h" #include "../async_logger.h"
#include "spdlog/common.h" #include "../common.h"
#include <chrono> #include <chrono>
#include <functional> #include <functional>
......
...@@ -8,23 +8,23 @@ ...@@ -8,23 +8,23 @@
// //
// Global registry functions // Global registry functions
// //
#include "spdlog/spdlog.h" #include "../spdlog.h"
#include "spdlog/details/registry.h" #include "../details/registry.h"
#include "spdlog/sinks/file_sinks.h" #include "../sinks/file_sinks.h"
#include "spdlog/sinks/stdout_sinks.h" #include "../sinks/stdout_sinks.h"
#ifdef SPDLOG_ENABLE_SYSLOG #ifdef SPDLOG_ENABLE_SYSLOG
#include "spdlog/sinks/syslog_sink.h" #include "../sinks/syslog_sink.h"
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#include "spdlog/sinks/wincolor_sink.h" #include "../sinks/wincolor_sink.h"
#else #else
#include "spdlog/sinks/ansicolor_sink.h" #include "../sinks/ansicolor_sink.h"
#endif #endif
#ifdef __ANDROID__ #ifdef __ANDROID__
#include "spdlog/sinks/android_sink.h" #include "../sinks/android_sink.h"
#endif #endif
#include <chrono> #include <chrono>
......
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
#ifndef FMT_USE_WINDOWS_H #ifndef FMT_USE_WINDOWS_H
#define FMT_USE_WINDOWS_H 0 #define FMT_USE_WINDOWS_H 0
#endif #endif
#include "spdlog/fmt/bundled/format.h" #include "../../fmt/format.h"
#if defined(SPDLOG_FMT_PRINTF) #if defined(SPDLOG_FMT_PRINTF)
#include "spdlog/fmt/bundled/printf.h" #include "../../fmt/printf.h"
#endif #endif
#else //external fmtlib #else //external fmtlib
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
// include external or bundled copy of fmtlib's ostream support // include external or bundled copy of fmtlib's ostream support
// //
#if !defined(SPDLOG_FMT_EXTERNAL) #if !defined(SPDLOG_FMT_EXTERNAL)
#include "spdlog/fmt/fmt.h" #include "fmt/fmt.h"
#include "spdlog/fmt/bundled/ostream.h" #include "fmt/bundled/ostream.h"
#else #else
#include <fmt/ostream.h> #include <fmt/ostream.h>
#endif #endif
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#pragma once #pragma once
#include "spdlog/details/log_msg.h" #include "details/log_msg.h"
#include <vector> #include <vector>
#include <string> #include <string>
...@@ -43,5 +43,5 @@ private: ...@@ -43,5 +43,5 @@ private:
}; };
} }
#include "spdlog/details/pattern_formatter_impl.h" #include "details/pattern_formatter_impl.h"
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// 2. Format the message using the formatter function // 2. Format the message using the formatter function
// 3. Pass the formatted message to its sinks to performa the actual logging // 3. Pass the formatted message to its sinks to performa the actual logging
#include "spdlog/sinks/base_sink.h" #include "sinks/base_sink.h"
#include "spdlog/common.h" #include "common.h"
#include <vector> #include <vector>
#include <memory> #include <memory>
...@@ -132,4 +132,4 @@ protected: ...@@ -132,4 +132,4 @@ protected:
}; };
} }
#include "spdlog/details/logger_impl.h" #include "details/logger_impl.h"
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#if defined(__ANDROID__) #if defined(__ANDROID__)
#include "spdlog/sinks/sink.h" #include "sink.h"
#include <mutex> #include <mutex>
#include <string> #include <string>
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
#pragma once #pragma once
#include "spdlog/sinks/base_sink.h" #include "base_sink.h"
#include "spdlog/common.h" #include "../common.h"
#include "spdlog/details/os.h" #include "../details/os.h"
#include <string> #include <string>
#include <map> #include <map>
......
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
// all locking is taken care of here so no locking needed by the implementers.. // all locking is taken care of here so no locking needed by the implementers..
// //
#include "spdlog/sinks/sink.h" #include "sink.h"
#include "spdlog/formatter.h" #include "../formatter.h"
#include "spdlog/common.h" #include "../common.h"
#include "spdlog/details/log_msg.h" #include "../details/log_msg.h"
#include <mutex> #include <mutex>
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
#pragma once #pragma once
#include "spdlog/details/log_msg.h" #include "../details/log_msg.h"
#include "spdlog/details/null_mutex.h" #include "../details/null_mutex.h"
#include "spdlog/sinks/base_sink.h" #include "base_sink.h"
#include "spdlog/sinks/sink.h" #include "sink.h"
#include <algorithm> #include <algorithm>
#include <mutex> #include <mutex>
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
#pragma once #pragma once
#include "spdlog/sinks/base_sink.h" #include "base_sink.h"
#include "spdlog/details/null_mutex.h" #include "../details/null_mutex.h"
#include "spdlog/details/file_helper.h" #include "../details/file_helper.h"
#include "spdlog/fmt/fmt.h" #include "../fmt/fmt.h"
#include <algorithm> #include <algorithm>
#include <chrono> #include <chrono>
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include "spdlog/sinks/base_sink.h" #include "base_sink.h"
#include "spdlog/details/null_mutex.h" #include "../details/null_mutex.h"
#include <WinBase.h> #include <WinBase.h>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#pragma once #pragma once
#include "spdlog/sinks/base_sink.h" #include "base_sink.h"
#include "spdlog/details/null_mutex.h" #include "../details/null_mutex.h"
#include <mutex> #include <mutex>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#pragma once #pragma once
#include "spdlog/details/null_mutex.h" #include "../details/null_mutex.h"
#include "spdlog/sinks/base_sink.h" #include "base_sink.h"
#include <ostream> #include <ostream>
#include <mutex> #include <mutex>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#pragma once #pragma once
#include "spdlog/details/log_msg.h" #include "../details/log_msg.h"
namespace spdlog namespace spdlog
{ {
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#pragma once #pragma once
#include "spdlog/details/null_mutex.h" #include "../details/null_mutex.h"
#include "spdlog/sinks/base_sink.h" #include "base_sink.h"
#include <cstdio> #include <cstdio>
#include <memory> #include <memory>
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
#pragma once #pragma once
#include "spdlog/common.h" #include "common.h"
#ifdef SPDLOG_ENABLE_SYSLOG #ifdef SPDLOG_ENABLE_SYSLOG
#include "spdlog/sinks/sink.h" #include "sink.h"
#include "spdlog/details/log_msg.h" #include "../details/log_msg.h"
#include <array> #include <array>
#include <string> #include <string>
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
#pragma once #pragma once
#include "spdlog/sinks/base_sink.h" #include "base_sink.h"
#include "spdlog/details/null_mutex.h" #include "../details/null_mutex.h"
#include "spdlog/common.h" #include "common.h"
#include <mutex> #include <mutex>
#include <string> #include <string>
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
#define SPDLOG_VERSION "0.14.0" #define SPDLOG_VERSION "0.14.0"
#include "spdlog/tweakme.h" #include "tweakme.h"
#include "spdlog/common.h" #include "common.h"
#include "spdlog/logger.h" #include "logger.h"
#include <memory> #include <memory>
#include <functional> #include <functional>
...@@ -191,4 +191,4 @@ void drop_all(); ...@@ -191,4 +191,4 @@ void drop_all();
} }
#include "spdlog/details/spdlog_impl.h" #include "details/spdlog_impl.h"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment