Skip to content

Commit

Permalink
revert spdlog changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Varun Mathur committed Feb 6, 2024
1 parent 480cfa8 commit 7604996
Show file tree
Hide file tree
Showing 28 changed files with 76 additions and 76 deletions.
6 changes: 3 additions & 3 deletions src/3rd_party/spdlog/async_logger.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
// 3. will throw spdlog_ex upon log exceptions
// Upong destruction, logs all remaining messages in the queue before destructing..

#include "spdlog/common.h"
#include "spdlog/logger.h"
#include <spdlog/common.h>
#include <spdlog/logger.h>

#include <chrono>
#include <functional>
Expand Down Expand Up @@ -70,5 +70,5 @@ class async_logger :public logger
}


#include "spdlog/details/async_logger_impl.h"
#include <spdlog/details/async_logger_impl.h>

2 changes: 1 addition & 1 deletion src/3rd_party/spdlog/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <locale>
#endif

#include "spdlog/details/null_mutex.h"
#include <spdlog/details/null_mutex.h>

//visual studio does not support noexcept yet
#ifndef _MSC_VER
Expand Down
12 changes: 6 additions & 6 deletions src/3rd_party/spdlog/details/async_log_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,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 <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 <chrono>
#include <exception>
Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/details/async_logger_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <spdlog/details/async_log_helper.h>
#include <spdlog/async_logger.h>

#include <string>
#include <functional>
Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/details/file_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
// Can be set to auto flush on every line
// Throw spdlog_ex exception on errors

#include "spdlog/details/os.h"
#include "spdlog/details/log_msg.h"
#include <spdlog/details/os.h>
#include <spdlog/details/log_msg.h>

#include <chrono>
#include <cstdio>
Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/details/line_logger_fwd.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
//
#pragma once

#include "spdlog/common.h"
#include "spdlog/details/log_msg.h"
#include <spdlog/common.h>
#include <spdlog/details/log_msg.h>

#include <string>

Expand Down
6 changes: 3 additions & 3 deletions src/3rd_party/spdlog/details/line_logger_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#pragma once
#include <type_traits>

#include "spdlog/details/line_logger_fwd.h"
#include "spdlog/common.h"
#include "spdlog/logger.h"
#include <spdlog/details/line_logger_fwd.h>
#include <spdlog/common.h>
#include <spdlog/logger.h>

#include <string>
#include <utility>
Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/details/log_msg.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#pragma once

#include "spdlog/common.h"
#include "spdlog/details/format.h"
#include <spdlog/common.h>
#include <spdlog/details/format.h>

#include <string>
#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion src/3rd_party/spdlog/details/logger_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#pragma once

#include "spdlog/logger.h"
#include <spdlog/logger.h>

#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion src/3rd_party/spdlog/details/mpmc_bounded_q.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Distributed under the MIT License (http://opensource.org/licenses/MIT)

#pragma once

#include "spdlog/common.h"
#include <spdlog/common.h>

#include <atomic>
#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion src/3rd_party/spdlog/details/os.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
#pragma once

#include "spdlog/common.h"
#include <spdlog/common.h>

#include <cstdio>
#include <ctime>
Expand Down
8 changes: 4 additions & 4 deletions src/3rd_party/spdlog/details/pattern_formatter_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

#pragma once

#include "spdlog/formatter.h"
#include "spdlog/details/log_msg.h"
#include "spdlog/details/os.h"
#include "spdlog/details/format.h"
#include <spdlog/formatter.h>
#include <spdlog/details/log_msg.h>
#include <spdlog/details/os.h>
#include <spdlog/details/format.h>

#include <chrono>
#include <ctime>
Expand Down
8 changes: 4 additions & 4 deletions src/3rd_party/spdlog/details/registry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <spdlog/details/null_mutex.h>
#include <spdlog/logger.h>
#include <spdlog/async_logger.h>
#include <spdlog/common.h>

#include <chrono>
#include <functional>
Expand Down
12 changes: 6 additions & 6 deletions src/3rd_party/spdlog/details/spdlog_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
//
// 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/sinks/syslog_sink.h"
#include "spdlog/sinks/ansicolor_sink.h"
#include <spdlog/spdlog.h>
#include <spdlog/details/registry.h>
#include <spdlog/sinks/file_sinks.h>
#include <spdlog/sinks/stdout_sinks.h>
#include <spdlog/sinks/syslog_sink.h>
#include <spdlog/sinks/ansicolor_sink.h>

#include <chrono>
#include <functional>
Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/formatter.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#pragma once

#include "spdlog/details/log_msg.h"
#include <spdlog/details/log_msg.h>

#include <vector>
#include <string>
Expand Down Expand Up @@ -41,5 +41,5 @@ class pattern_formatter : public formatter
};
}

#include "spdlog/details/pattern_formatter_impl.h"
#include <spdlog/details/pattern_formatter_impl.h>

10 changes: 5 additions & 5 deletions src/3rd_party/spdlog/logger.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// 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 "spdlog/details/line_logger_fwd.h"
#include <spdlog/sinks/base_sink.h>
#include <spdlog/common.h>
#include <spdlog/details/line_logger_fwd.h>

#include <vector>
#include <memory>
Expand Down Expand Up @@ -107,6 +107,6 @@ class logger
};
}

#include "spdlog/details/logger_impl.h"
#include "spdlog/details/line_logger_impl.h"
#include <spdlog/details/logger_impl.h>
#include <spdlog/details/line_logger_impl.h>

4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/sinks/android_sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

#if defined(__ANDROID__)

#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.h>

#include <android/log.h>

Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/sinks/ansicolor_sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#pragma once

#include "spdlog/sinks/base_sink.h"
#include "spdlog/common.h"
#include <spdlog/sinks/base_sink.h>
#include <spdlog/common.h>

#include <string>
#include <map>
Expand Down
8 changes: 4 additions & 4 deletions src/3rd_party/spdlog/sinks/base_sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
// all locking is taken care of here so no locking needed by the implementors..
//

#include "spdlog/sinks/sink.h"
#include "spdlog/formatter.h"
#include "spdlog/common.h"
#include "spdlog/details/log_msg.h"
#include <spdlog/sinks/sink.h>
#include <spdlog/formatter.h>
#include <spdlog/common.h>
#include <spdlog/details/log_msg.h>

#include <mutex>

Expand Down
8 changes: 4 additions & 4 deletions src/3rd_party/spdlog/sinks/dist_sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <spdlog/details/log_msg.h>
#include <spdlog/details/null_mutex.h>
#include <spdlog/sinks/base_sink.h>
#include <spdlog/sinks/sink.h>

#include <algorithm>
#include <memory>
Expand Down
8 changes: 4 additions & 4 deletions src/3rd_party/spdlog/sinks/file_sinks.h
Original file line number Diff line number Diff line change
Expand Up @@ -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/details/format.h"
#include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.h>
#include <spdlog/details/file_helper.h>
#include <spdlog/details/format.h>

#include <algorithm>
#include <chrono>
Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/sinks/msvc_sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

#if defined(_MSC_VER)

#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.h>

#include <WinBase.h>

Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/sinks/null_sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#pragma once

#include "spdlog/sinks/base_sink.h"
#include "spdlog/details/null_mutex.h"
#include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.h>

#include <mutex>

Expand Down
4 changes: 2 additions & 2 deletions src/3rd_party/spdlog/sinks/ostream_sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

#pragma once

#include "spdlog/details/null_mutex.h"
#include "spdlog/sinks/base_sink.h"
#include <spdlog/details/null_mutex.h>
#include <spdlog/sinks/base_sink.h>

#include <ostream>
#include <mutex>
Expand Down
2 changes: 1 addition & 1 deletion src/3rd_party/spdlog/sinks/sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#pragma once

#include "spdlog/details/log_msg.h"
#include <spdlog/details/log_msg.h>

namespace spdlog
{
Expand Down
2 changes: 1 addition & 1 deletion src/3rd_party/spdlog/sinks/stdout_sinks.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#pragma once

#include "spdlog/details/null_mutex.h"
#include <spdlog/details/null_mutex.h>

#include <cstdio>
#include <memory>
Expand Down
6 changes: 3 additions & 3 deletions src/3rd_party/spdlog/sinks/syslog_sink.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

#if defined(__linux__) || defined(__APPLE__)

#include "spdlog/sinks/sink.h"
#include "spdlog/common.h"
#include "spdlog/details/log_msg.h"
#include <spdlog/sinks/sink.h>
#include <spdlog/common.h>
#include <spdlog/details/log_msg.h>

#include <array>
#include <string>
Expand Down
8 changes: 4 additions & 4 deletions src/3rd_party/spdlog/spdlog.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#pragma once

#include "spdlog/tweakme.h"
#include "spdlog/common.h"
#include "spdlog/logger.h"
#include <spdlog/tweakme.h>
#include <spdlog/common.h>
#include <spdlog/logger.h>

#include <memory>
#include <functional>
Expand Down Expand Up @@ -136,4 +136,4 @@ void drop_all();
}


#include "spdlog/details/spdlog_impl.h"
#include <spdlog/details/spdlog_impl.h>

0 comments on commit 7604996

Please sign in to comment.