From 6c69aa1046c98ef20130a2965e5d777b98ed9e1c Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 6 Aug 2024 21:20:55 +0800 Subject: [PATCH] update --- .../{include/nlohmann => }/adl_serializer.hpp | 0 .../byte_container_with_subtype.hpp | 0 .../nlohmann => }/detail/abi_macros.hpp | 0 .../detail/conversions/from_json.hpp | 0 .../detail/conversions/to_chars.hpp | 0 .../detail/conversions/to_json.hpp | 0 .../nlohmann => }/detail/exceptions.hpp | 0 .../{include/nlohmann => }/detail/hash.hpp | 0 .../detail/input/binary_reader.hpp | 0 .../detail/input/input_adapters.hpp | 0 .../nlohmann => }/detail/input/json_sax.hpp | 0 .../nlohmann => }/detail/input/lexer.hpp | 0 .../nlohmann => }/detail/input/parser.hpp | 0 .../nlohmann => }/detail/input/position_t.hpp | 0 .../detail/iterators/internal_iterator.hpp | 0 .../detail/iterators/iter_impl.hpp | 0 .../detail/iterators/iteration_proxy.hpp | 0 .../detail/iterators/iterator_traits.hpp | 0 .../iterators/json_reverse_iterator.hpp | 0 .../detail/iterators/primitive_iterator.hpp | 0 .../detail/json_custom_base_class.hpp | 0 .../nlohmann => }/detail/json_pointer.hpp | 0 .../nlohmann => }/detail/json_ref.hpp | 0 .../nlohmann => }/detail/macro_scope.hpp | 0 .../nlohmann => }/detail/macro_unscope.hpp | 0 .../detail/meta/call_std/begin.hpp | 0 .../detail/meta/call_std/end.hpp | 0 .../nlohmann => }/detail/meta/cpp_future.hpp | 0 .../nlohmann => }/detail/meta/detected.hpp | 0 .../detail/meta/identity_tag.hpp | 0 .../nlohmann => }/detail/meta/is_sax.hpp | 0 .../nlohmann => }/detail/meta/std_fs.hpp | 0 .../nlohmann => }/detail/meta/type_traits.hpp | 0 .../nlohmann => }/detail/meta/void_t.hpp | 0 .../detail/output/binary_writer.hpp | 0 .../detail/output/output_adapters.hpp | 0 .../detail/output/serializer.hpp | 0 .../nlohmann => }/detail/string_concat.hpp | 0 .../nlohmann => }/detail/string_escape.hpp | 0 .../{include/nlohmann => }/detail/value_t.hpp | 0 inc/nlohmann/{include/nlohmann => }/json.hpp | 0 .../{include/nlohmann => }/json_fwd.hpp | 0 .../{include/nlohmann => }/ordered_map.hpp | 0 .../thirdparty/hedley/hedley.hpp | 0 .../thirdparty/hedley/hedley_undef.hpp | 0 inc/spdlog/{include/spdlog => }/async.h | 0 .../{include/spdlog => }/async_logger-inl.h | 0 .../{include/spdlog => }/async_logger.h | 0 inc/spdlog/{include/spdlog => }/cfg/argv.h | 0 inc/spdlog/{include/spdlog => }/cfg/env.h | 0 .../{include/spdlog => }/cfg/helpers-inl.h | 0 inc/spdlog/{include/spdlog => }/cfg/helpers.h | 0 inc/spdlog/{include/spdlog => }/common-inl.h | 0 inc/spdlog/{include/spdlog => }/common.h | 0 .../spdlog => }/details/backtracer-inl.h | 0 .../{include/spdlog => }/details/backtracer.h | 0 .../{include/spdlog => }/details/circular_q.h | 0 .../spdlog => }/details/console_globals.h | 0 .../spdlog => }/details/file_helper-inl.h | 0 .../spdlog => }/details/file_helper.h | 0 .../{include/spdlog => }/details/fmt_helper.h | 0 .../spdlog => }/details/log_msg-inl.h | 0 .../{include/spdlog => }/details/log_msg.h | 0 .../spdlog => }/details/log_msg_buffer-inl.h | 0 .../spdlog => }/details/log_msg_buffer.h | 0 .../spdlog => }/details/mpmc_blocking_q.h | 0 .../{include/spdlog => }/details/null_mutex.h | 0 .../{include/spdlog => }/details/os-inl.h | 0 inc/spdlog/{include/spdlog => }/details/os.h | 0 .../spdlog => }/details/periodic_worker-inl.h | 0 .../spdlog => }/details/periodic_worker.h | 0 .../spdlog => }/details/registry-inl.h | 0 .../{include/spdlog => }/details/registry.h | 0 .../spdlog => }/details/synchronous_factory.h | 0 .../spdlog => }/details/tcp_client-windows.h | 0 .../{include/spdlog => }/details/tcp_client.h | 0 .../spdlog => }/details/thread_pool-inl.h | 0 .../spdlog => }/details/thread_pool.h | 0 .../spdlog => }/details/udp_client-windows.h | 0 .../{include/spdlog => }/details/udp_client.h | 0 .../spdlog => }/details/windows_include.h | 0 .../{include/spdlog => }/fmt/bin_to_hex.h | 0 .../{include/spdlog => }/fmt/bundled/args.h | 0 .../{include/spdlog => }/fmt/bundled/chrono.h | 0 .../{include/spdlog => }/fmt/bundled/color.h | 0 .../spdlog => }/fmt/bundled/compile.h | 0 .../{include/spdlog => }/fmt/bundled/core.h | 0 .../spdlog => }/fmt/bundled/fmt.license.rst | 0 .../spdlog => }/fmt/bundled/format-inl.h | 0 .../{include/spdlog => }/fmt/bundled/format.h | 0 .../{include/spdlog => }/fmt/bundled/locale.h | 0 .../{include/spdlog => }/fmt/bundled/os.h | 0 .../spdlog => }/fmt/bundled/ostream.h | 0 .../{include/spdlog => }/fmt/bundled/printf.h | 0 .../{include/spdlog => }/fmt/bundled/ranges.h | 0 .../{include/spdlog => }/fmt/bundled/std.h | 0 .../{include/spdlog => }/fmt/bundled/xchar.h | 0 inc/spdlog/{include/spdlog => }/fmt/chrono.h | 0 inc/spdlog/{include/spdlog => }/fmt/compile.h | 0 inc/spdlog/{include/spdlog => }/fmt/fmt.h | 0 inc/spdlog/{include/spdlog => }/fmt/ostr.h | 0 inc/spdlog/{include/spdlog => }/fmt/ranges.h | 0 inc/spdlog/{include/spdlog => }/fmt/std.h | 0 inc/spdlog/{include/spdlog => }/fmt/xchar.h | 0 inc/spdlog/{include/spdlog => }/formatter.h | 0 inc/spdlog/{include/spdlog => }/fwd.h | 0 inc/spdlog/{include/spdlog => }/logger-inl.h | 0 inc/spdlog/{include/spdlog => }/logger.h | 0 .../spdlog => }/pattern_formatter-inl.h | 0 .../{include/spdlog => }/pattern_formatter.h | 0 .../{include/spdlog => }/sinks/android_sink.h | 0 .../spdlog => }/sinks/ansicolor_sink-inl.h | 0 .../spdlog => }/sinks/ansicolor_sink.h | 0 .../spdlog => }/sinks/base_sink-inl.h | 0 .../{include/spdlog => }/sinks/base_sink.h | 0 .../spdlog => }/sinks/basic_file_sink-inl.h | 0 .../spdlog => }/sinks/basic_file_sink.h | 0 .../spdlog => }/sinks/callback_sink.h | 0 .../spdlog => }/sinks/daily_file_sink.h | 0 .../{include/spdlog => }/sinks/dist_sink.h | 0 .../spdlog => }/sinks/dup_filter_sink.h | 0 .../spdlog => }/sinks/hourly_file_sink.h | 0 .../{include/spdlog => }/sinks/kafka_sink.h | 0 .../{include/spdlog => }/sinks/mongo_sink.h | 0 .../{include/spdlog => }/sinks/msvc_sink.h | 0 .../{include/spdlog => }/sinks/null_sink.h | 0 .../{include/spdlog => }/sinks/ostream_sink.h | 0 .../{include/spdlog => }/sinks/qt_sinks.h | 0 .../spdlog => }/sinks/ringbuffer_sink.h | 0 .../sinks/rotating_file_sink-inl.h | 0 .../spdlog => }/sinks/rotating_file_sink.h | 0 .../{include/spdlog => }/sinks/sink-inl.h | 0 inc/spdlog/{include/spdlog => }/sinks/sink.h | 0 .../sinks/stdout_color_sinks-inl.h | 0 .../spdlog => }/sinks/stdout_color_sinks.h | 0 .../spdlog => }/sinks/stdout_sinks-inl.h | 0 .../{include/spdlog => }/sinks/stdout_sinks.h | 0 .../{include/spdlog => }/sinks/syslog_sink.h | 0 .../{include/spdlog => }/sinks/systemd_sink.h | 0 .../{include/spdlog => }/sinks/tcp_sink.h | 0 .../{include/spdlog => }/sinks/udp_sink.h | 0 .../spdlog => }/sinks/win_eventlog_sink.h | 0 .../spdlog => }/sinks/wincolor_sink-inl.h | 0 .../spdlog => }/sinks/wincolor_sink.h | 0 inc/spdlog/{include/spdlog => }/spdlog-inl.h | 0 inc/spdlog/{include/spdlog => }/spdlog.h | 0 inc/spdlog/{include/spdlog => }/stopwatch.h | 0 inc/spdlog/{include/spdlog => }/tweakme.h | 0 inc/spdlog/{include/spdlog => }/version.h | 0 src/thread_pool.cc | 44 ------------------- wxhelper.vcxproj | 5 +-- wxhelper.vcxproj.filters | 3 -- 152 files changed, 2 insertions(+), 50 deletions(-) rename inc/nlohmann/{include/nlohmann => }/adl_serializer.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/byte_container_with_subtype.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/abi_macros.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/conversions/from_json.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/conversions/to_chars.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/conversions/to_json.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/exceptions.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/hash.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/input/binary_reader.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/input/input_adapters.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/input/json_sax.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/input/lexer.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/input/parser.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/input/position_t.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/iterators/internal_iterator.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/iterators/iter_impl.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/iterators/iteration_proxy.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/iterators/iterator_traits.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/iterators/json_reverse_iterator.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/iterators/primitive_iterator.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/json_custom_base_class.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/json_pointer.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/json_ref.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/macro_scope.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/macro_unscope.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/meta/call_std/begin.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/meta/call_std/end.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/meta/cpp_future.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/meta/detected.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/meta/identity_tag.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/meta/is_sax.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/meta/std_fs.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/meta/type_traits.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/meta/void_t.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/output/binary_writer.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/output/output_adapters.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/output/serializer.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/string_concat.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/string_escape.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/detail/value_t.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/json.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/json_fwd.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/ordered_map.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/thirdparty/hedley/hedley.hpp (100%) rename inc/nlohmann/{include/nlohmann => }/thirdparty/hedley/hedley_undef.hpp (100%) rename inc/spdlog/{include/spdlog => }/async.h (100%) rename inc/spdlog/{include/spdlog => }/async_logger-inl.h (100%) rename inc/spdlog/{include/spdlog => }/async_logger.h (100%) rename inc/spdlog/{include/spdlog => }/cfg/argv.h (100%) rename inc/spdlog/{include/spdlog => }/cfg/env.h (100%) rename inc/spdlog/{include/spdlog => }/cfg/helpers-inl.h (100%) rename inc/spdlog/{include/spdlog => }/cfg/helpers.h (100%) rename inc/spdlog/{include/spdlog => }/common-inl.h (100%) rename inc/spdlog/{include/spdlog => }/common.h (100%) rename inc/spdlog/{include/spdlog => }/details/backtracer-inl.h (100%) rename inc/spdlog/{include/spdlog => }/details/backtracer.h (100%) rename inc/spdlog/{include/spdlog => }/details/circular_q.h (100%) rename inc/spdlog/{include/spdlog => }/details/console_globals.h (100%) rename inc/spdlog/{include/spdlog => }/details/file_helper-inl.h (100%) rename inc/spdlog/{include/spdlog => }/details/file_helper.h (100%) rename inc/spdlog/{include/spdlog => }/details/fmt_helper.h (100%) rename inc/spdlog/{include/spdlog => }/details/log_msg-inl.h (100%) rename inc/spdlog/{include/spdlog => }/details/log_msg.h (100%) rename inc/spdlog/{include/spdlog => }/details/log_msg_buffer-inl.h (100%) rename inc/spdlog/{include/spdlog => }/details/log_msg_buffer.h (100%) rename inc/spdlog/{include/spdlog => }/details/mpmc_blocking_q.h (100%) rename inc/spdlog/{include/spdlog => }/details/null_mutex.h (100%) rename inc/spdlog/{include/spdlog => }/details/os-inl.h (100%) rename inc/spdlog/{include/spdlog => }/details/os.h (100%) rename inc/spdlog/{include/spdlog => }/details/periodic_worker-inl.h (100%) rename inc/spdlog/{include/spdlog => }/details/periodic_worker.h (100%) rename inc/spdlog/{include/spdlog => }/details/registry-inl.h (100%) rename inc/spdlog/{include/spdlog => }/details/registry.h (100%) rename inc/spdlog/{include/spdlog => }/details/synchronous_factory.h (100%) rename inc/spdlog/{include/spdlog => }/details/tcp_client-windows.h (100%) rename inc/spdlog/{include/spdlog => }/details/tcp_client.h (100%) rename inc/spdlog/{include/spdlog => }/details/thread_pool-inl.h (100%) rename inc/spdlog/{include/spdlog => }/details/thread_pool.h (100%) rename inc/spdlog/{include/spdlog => }/details/udp_client-windows.h (100%) rename inc/spdlog/{include/spdlog => }/details/udp_client.h (100%) rename inc/spdlog/{include/spdlog => }/details/windows_include.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bin_to_hex.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/args.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/chrono.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/color.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/compile.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/core.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/fmt.license.rst (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/format-inl.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/format.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/locale.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/os.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/ostream.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/printf.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/ranges.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/std.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/bundled/xchar.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/chrono.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/compile.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/fmt.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/ostr.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/ranges.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/std.h (100%) rename inc/spdlog/{include/spdlog => }/fmt/xchar.h (100%) rename inc/spdlog/{include/spdlog => }/formatter.h (100%) rename inc/spdlog/{include/spdlog => }/fwd.h (100%) rename inc/spdlog/{include/spdlog => }/logger-inl.h (100%) rename inc/spdlog/{include/spdlog => }/logger.h (100%) rename inc/spdlog/{include/spdlog => }/pattern_formatter-inl.h (100%) rename inc/spdlog/{include/spdlog => }/pattern_formatter.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/android_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/ansicolor_sink-inl.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/ansicolor_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/base_sink-inl.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/base_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/basic_file_sink-inl.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/basic_file_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/callback_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/daily_file_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/dist_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/dup_filter_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/hourly_file_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/kafka_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/mongo_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/msvc_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/null_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/ostream_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/qt_sinks.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/ringbuffer_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/rotating_file_sink-inl.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/rotating_file_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/sink-inl.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/stdout_color_sinks-inl.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/stdout_color_sinks.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/stdout_sinks-inl.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/stdout_sinks.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/syslog_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/systemd_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/tcp_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/udp_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/win_eventlog_sink.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/wincolor_sink-inl.h (100%) rename inc/spdlog/{include/spdlog => }/sinks/wincolor_sink.h (100%) rename inc/spdlog/{include/spdlog => }/spdlog-inl.h (100%) rename inc/spdlog/{include/spdlog => }/spdlog.h (100%) rename inc/spdlog/{include/spdlog => }/stopwatch.h (100%) rename inc/spdlog/{include/spdlog => }/tweakme.h (100%) rename inc/spdlog/{include/spdlog => }/version.h (100%) delete mode 100644 src/thread_pool.cc diff --git a/inc/nlohmann/include/nlohmann/adl_serializer.hpp b/inc/nlohmann/adl_serializer.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/adl_serializer.hpp rename to inc/nlohmann/adl_serializer.hpp diff --git a/inc/nlohmann/include/nlohmann/byte_container_with_subtype.hpp b/inc/nlohmann/byte_container_with_subtype.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/byte_container_with_subtype.hpp rename to inc/nlohmann/byte_container_with_subtype.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/abi_macros.hpp b/inc/nlohmann/detail/abi_macros.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/abi_macros.hpp rename to inc/nlohmann/detail/abi_macros.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/conversions/from_json.hpp b/inc/nlohmann/detail/conversions/from_json.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/conversions/from_json.hpp rename to inc/nlohmann/detail/conversions/from_json.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/conversions/to_chars.hpp b/inc/nlohmann/detail/conversions/to_chars.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/conversions/to_chars.hpp rename to inc/nlohmann/detail/conversions/to_chars.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/conversions/to_json.hpp b/inc/nlohmann/detail/conversions/to_json.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/conversions/to_json.hpp rename to inc/nlohmann/detail/conversions/to_json.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/exceptions.hpp b/inc/nlohmann/detail/exceptions.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/exceptions.hpp rename to inc/nlohmann/detail/exceptions.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/hash.hpp b/inc/nlohmann/detail/hash.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/hash.hpp rename to inc/nlohmann/detail/hash.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/input/binary_reader.hpp b/inc/nlohmann/detail/input/binary_reader.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/input/binary_reader.hpp rename to inc/nlohmann/detail/input/binary_reader.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/input/input_adapters.hpp b/inc/nlohmann/detail/input/input_adapters.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/input/input_adapters.hpp rename to inc/nlohmann/detail/input/input_adapters.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/input/json_sax.hpp b/inc/nlohmann/detail/input/json_sax.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/input/json_sax.hpp rename to inc/nlohmann/detail/input/json_sax.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/input/lexer.hpp b/inc/nlohmann/detail/input/lexer.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/input/lexer.hpp rename to inc/nlohmann/detail/input/lexer.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/input/parser.hpp b/inc/nlohmann/detail/input/parser.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/input/parser.hpp rename to inc/nlohmann/detail/input/parser.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/input/position_t.hpp b/inc/nlohmann/detail/input/position_t.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/input/position_t.hpp rename to inc/nlohmann/detail/input/position_t.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/iterators/internal_iterator.hpp b/inc/nlohmann/detail/iterators/internal_iterator.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/iterators/internal_iterator.hpp rename to inc/nlohmann/detail/iterators/internal_iterator.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/iterators/iter_impl.hpp b/inc/nlohmann/detail/iterators/iter_impl.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/iterators/iter_impl.hpp rename to inc/nlohmann/detail/iterators/iter_impl.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/iterators/iteration_proxy.hpp b/inc/nlohmann/detail/iterators/iteration_proxy.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/iterators/iteration_proxy.hpp rename to inc/nlohmann/detail/iterators/iteration_proxy.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/iterators/iterator_traits.hpp b/inc/nlohmann/detail/iterators/iterator_traits.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/iterators/iterator_traits.hpp rename to inc/nlohmann/detail/iterators/iterator_traits.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/iterators/json_reverse_iterator.hpp b/inc/nlohmann/detail/iterators/json_reverse_iterator.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/iterators/json_reverse_iterator.hpp rename to inc/nlohmann/detail/iterators/json_reverse_iterator.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/iterators/primitive_iterator.hpp b/inc/nlohmann/detail/iterators/primitive_iterator.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/iterators/primitive_iterator.hpp rename to inc/nlohmann/detail/iterators/primitive_iterator.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/json_custom_base_class.hpp b/inc/nlohmann/detail/json_custom_base_class.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/json_custom_base_class.hpp rename to inc/nlohmann/detail/json_custom_base_class.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/json_pointer.hpp b/inc/nlohmann/detail/json_pointer.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/json_pointer.hpp rename to inc/nlohmann/detail/json_pointer.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/json_ref.hpp b/inc/nlohmann/detail/json_ref.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/json_ref.hpp rename to inc/nlohmann/detail/json_ref.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/macro_scope.hpp b/inc/nlohmann/detail/macro_scope.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/macro_scope.hpp rename to inc/nlohmann/detail/macro_scope.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/macro_unscope.hpp b/inc/nlohmann/detail/macro_unscope.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/macro_unscope.hpp rename to inc/nlohmann/detail/macro_unscope.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/meta/call_std/begin.hpp b/inc/nlohmann/detail/meta/call_std/begin.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/meta/call_std/begin.hpp rename to inc/nlohmann/detail/meta/call_std/begin.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/meta/call_std/end.hpp b/inc/nlohmann/detail/meta/call_std/end.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/meta/call_std/end.hpp rename to inc/nlohmann/detail/meta/call_std/end.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/meta/cpp_future.hpp b/inc/nlohmann/detail/meta/cpp_future.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/meta/cpp_future.hpp rename to inc/nlohmann/detail/meta/cpp_future.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/meta/detected.hpp b/inc/nlohmann/detail/meta/detected.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/meta/detected.hpp rename to inc/nlohmann/detail/meta/detected.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/meta/identity_tag.hpp b/inc/nlohmann/detail/meta/identity_tag.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/meta/identity_tag.hpp rename to inc/nlohmann/detail/meta/identity_tag.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/meta/is_sax.hpp b/inc/nlohmann/detail/meta/is_sax.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/meta/is_sax.hpp rename to inc/nlohmann/detail/meta/is_sax.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/meta/std_fs.hpp b/inc/nlohmann/detail/meta/std_fs.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/meta/std_fs.hpp rename to inc/nlohmann/detail/meta/std_fs.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/meta/type_traits.hpp b/inc/nlohmann/detail/meta/type_traits.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/meta/type_traits.hpp rename to inc/nlohmann/detail/meta/type_traits.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/meta/void_t.hpp b/inc/nlohmann/detail/meta/void_t.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/meta/void_t.hpp rename to inc/nlohmann/detail/meta/void_t.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/output/binary_writer.hpp b/inc/nlohmann/detail/output/binary_writer.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/output/binary_writer.hpp rename to inc/nlohmann/detail/output/binary_writer.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/output/output_adapters.hpp b/inc/nlohmann/detail/output/output_adapters.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/output/output_adapters.hpp rename to inc/nlohmann/detail/output/output_adapters.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/output/serializer.hpp b/inc/nlohmann/detail/output/serializer.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/output/serializer.hpp rename to inc/nlohmann/detail/output/serializer.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/string_concat.hpp b/inc/nlohmann/detail/string_concat.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/string_concat.hpp rename to inc/nlohmann/detail/string_concat.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/string_escape.hpp b/inc/nlohmann/detail/string_escape.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/string_escape.hpp rename to inc/nlohmann/detail/string_escape.hpp diff --git a/inc/nlohmann/include/nlohmann/detail/value_t.hpp b/inc/nlohmann/detail/value_t.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/detail/value_t.hpp rename to inc/nlohmann/detail/value_t.hpp diff --git a/inc/nlohmann/include/nlohmann/json.hpp b/inc/nlohmann/json.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/json.hpp rename to inc/nlohmann/json.hpp diff --git a/inc/nlohmann/include/nlohmann/json_fwd.hpp b/inc/nlohmann/json_fwd.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/json_fwd.hpp rename to inc/nlohmann/json_fwd.hpp diff --git a/inc/nlohmann/include/nlohmann/ordered_map.hpp b/inc/nlohmann/ordered_map.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/ordered_map.hpp rename to inc/nlohmann/ordered_map.hpp diff --git a/inc/nlohmann/include/nlohmann/thirdparty/hedley/hedley.hpp b/inc/nlohmann/thirdparty/hedley/hedley.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/thirdparty/hedley/hedley.hpp rename to inc/nlohmann/thirdparty/hedley/hedley.hpp diff --git a/inc/nlohmann/include/nlohmann/thirdparty/hedley/hedley_undef.hpp b/inc/nlohmann/thirdparty/hedley/hedley_undef.hpp similarity index 100% rename from inc/nlohmann/include/nlohmann/thirdparty/hedley/hedley_undef.hpp rename to inc/nlohmann/thirdparty/hedley/hedley_undef.hpp diff --git a/inc/spdlog/include/spdlog/async.h b/inc/spdlog/async.h similarity index 100% rename from inc/spdlog/include/spdlog/async.h rename to inc/spdlog/async.h diff --git a/inc/spdlog/include/spdlog/async_logger-inl.h b/inc/spdlog/async_logger-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/async_logger-inl.h rename to inc/spdlog/async_logger-inl.h diff --git a/inc/spdlog/include/spdlog/async_logger.h b/inc/spdlog/async_logger.h similarity index 100% rename from inc/spdlog/include/spdlog/async_logger.h rename to inc/spdlog/async_logger.h diff --git a/inc/spdlog/include/spdlog/cfg/argv.h b/inc/spdlog/cfg/argv.h similarity index 100% rename from inc/spdlog/include/spdlog/cfg/argv.h rename to inc/spdlog/cfg/argv.h diff --git a/inc/spdlog/include/spdlog/cfg/env.h b/inc/spdlog/cfg/env.h similarity index 100% rename from inc/spdlog/include/spdlog/cfg/env.h rename to inc/spdlog/cfg/env.h diff --git a/inc/spdlog/include/spdlog/cfg/helpers-inl.h b/inc/spdlog/cfg/helpers-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/cfg/helpers-inl.h rename to inc/spdlog/cfg/helpers-inl.h diff --git a/inc/spdlog/include/spdlog/cfg/helpers.h b/inc/spdlog/cfg/helpers.h similarity index 100% rename from inc/spdlog/include/spdlog/cfg/helpers.h rename to inc/spdlog/cfg/helpers.h diff --git a/inc/spdlog/include/spdlog/common-inl.h b/inc/spdlog/common-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/common-inl.h rename to inc/spdlog/common-inl.h diff --git a/inc/spdlog/include/spdlog/common.h b/inc/spdlog/common.h similarity index 100% rename from inc/spdlog/include/spdlog/common.h rename to inc/spdlog/common.h diff --git a/inc/spdlog/include/spdlog/details/backtracer-inl.h b/inc/spdlog/details/backtracer-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/details/backtracer-inl.h rename to inc/spdlog/details/backtracer-inl.h diff --git a/inc/spdlog/include/spdlog/details/backtracer.h b/inc/spdlog/details/backtracer.h similarity index 100% rename from inc/spdlog/include/spdlog/details/backtracer.h rename to inc/spdlog/details/backtracer.h diff --git a/inc/spdlog/include/spdlog/details/circular_q.h b/inc/spdlog/details/circular_q.h similarity index 100% rename from inc/spdlog/include/spdlog/details/circular_q.h rename to inc/spdlog/details/circular_q.h diff --git a/inc/spdlog/include/spdlog/details/console_globals.h b/inc/spdlog/details/console_globals.h similarity index 100% rename from inc/spdlog/include/spdlog/details/console_globals.h rename to inc/spdlog/details/console_globals.h diff --git a/inc/spdlog/include/spdlog/details/file_helper-inl.h b/inc/spdlog/details/file_helper-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/details/file_helper-inl.h rename to inc/spdlog/details/file_helper-inl.h diff --git a/inc/spdlog/include/spdlog/details/file_helper.h b/inc/spdlog/details/file_helper.h similarity index 100% rename from inc/spdlog/include/spdlog/details/file_helper.h rename to inc/spdlog/details/file_helper.h diff --git a/inc/spdlog/include/spdlog/details/fmt_helper.h b/inc/spdlog/details/fmt_helper.h similarity index 100% rename from inc/spdlog/include/spdlog/details/fmt_helper.h rename to inc/spdlog/details/fmt_helper.h diff --git a/inc/spdlog/include/spdlog/details/log_msg-inl.h b/inc/spdlog/details/log_msg-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/details/log_msg-inl.h rename to inc/spdlog/details/log_msg-inl.h diff --git a/inc/spdlog/include/spdlog/details/log_msg.h b/inc/spdlog/details/log_msg.h similarity index 100% rename from inc/spdlog/include/spdlog/details/log_msg.h rename to inc/spdlog/details/log_msg.h diff --git a/inc/spdlog/include/spdlog/details/log_msg_buffer-inl.h b/inc/spdlog/details/log_msg_buffer-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/details/log_msg_buffer-inl.h rename to inc/spdlog/details/log_msg_buffer-inl.h diff --git a/inc/spdlog/include/spdlog/details/log_msg_buffer.h b/inc/spdlog/details/log_msg_buffer.h similarity index 100% rename from inc/spdlog/include/spdlog/details/log_msg_buffer.h rename to inc/spdlog/details/log_msg_buffer.h diff --git a/inc/spdlog/include/spdlog/details/mpmc_blocking_q.h b/inc/spdlog/details/mpmc_blocking_q.h similarity index 100% rename from inc/spdlog/include/spdlog/details/mpmc_blocking_q.h rename to inc/spdlog/details/mpmc_blocking_q.h diff --git a/inc/spdlog/include/spdlog/details/null_mutex.h b/inc/spdlog/details/null_mutex.h similarity index 100% rename from inc/spdlog/include/spdlog/details/null_mutex.h rename to inc/spdlog/details/null_mutex.h diff --git a/inc/spdlog/include/spdlog/details/os-inl.h b/inc/spdlog/details/os-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/details/os-inl.h rename to inc/spdlog/details/os-inl.h diff --git a/inc/spdlog/include/spdlog/details/os.h b/inc/spdlog/details/os.h similarity index 100% rename from inc/spdlog/include/spdlog/details/os.h rename to inc/spdlog/details/os.h diff --git a/inc/spdlog/include/spdlog/details/periodic_worker-inl.h b/inc/spdlog/details/periodic_worker-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/details/periodic_worker-inl.h rename to inc/spdlog/details/periodic_worker-inl.h diff --git a/inc/spdlog/include/spdlog/details/periodic_worker.h b/inc/spdlog/details/periodic_worker.h similarity index 100% rename from inc/spdlog/include/spdlog/details/periodic_worker.h rename to inc/spdlog/details/periodic_worker.h diff --git a/inc/spdlog/include/spdlog/details/registry-inl.h b/inc/spdlog/details/registry-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/details/registry-inl.h rename to inc/spdlog/details/registry-inl.h diff --git a/inc/spdlog/include/spdlog/details/registry.h b/inc/spdlog/details/registry.h similarity index 100% rename from inc/spdlog/include/spdlog/details/registry.h rename to inc/spdlog/details/registry.h diff --git a/inc/spdlog/include/spdlog/details/synchronous_factory.h b/inc/spdlog/details/synchronous_factory.h similarity index 100% rename from inc/spdlog/include/spdlog/details/synchronous_factory.h rename to inc/spdlog/details/synchronous_factory.h diff --git a/inc/spdlog/include/spdlog/details/tcp_client-windows.h b/inc/spdlog/details/tcp_client-windows.h similarity index 100% rename from inc/spdlog/include/spdlog/details/tcp_client-windows.h rename to inc/spdlog/details/tcp_client-windows.h diff --git a/inc/spdlog/include/spdlog/details/tcp_client.h b/inc/spdlog/details/tcp_client.h similarity index 100% rename from inc/spdlog/include/spdlog/details/tcp_client.h rename to inc/spdlog/details/tcp_client.h diff --git a/inc/spdlog/include/spdlog/details/thread_pool-inl.h b/inc/spdlog/details/thread_pool-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/details/thread_pool-inl.h rename to inc/spdlog/details/thread_pool-inl.h diff --git a/inc/spdlog/include/spdlog/details/thread_pool.h b/inc/spdlog/details/thread_pool.h similarity index 100% rename from inc/spdlog/include/spdlog/details/thread_pool.h rename to inc/spdlog/details/thread_pool.h diff --git a/inc/spdlog/include/spdlog/details/udp_client-windows.h b/inc/spdlog/details/udp_client-windows.h similarity index 100% rename from inc/spdlog/include/spdlog/details/udp_client-windows.h rename to inc/spdlog/details/udp_client-windows.h diff --git a/inc/spdlog/include/spdlog/details/udp_client.h b/inc/spdlog/details/udp_client.h similarity index 100% rename from inc/spdlog/include/spdlog/details/udp_client.h rename to inc/spdlog/details/udp_client.h diff --git a/inc/spdlog/include/spdlog/details/windows_include.h b/inc/spdlog/details/windows_include.h similarity index 100% rename from inc/spdlog/include/spdlog/details/windows_include.h rename to inc/spdlog/details/windows_include.h diff --git a/inc/spdlog/include/spdlog/fmt/bin_to_hex.h b/inc/spdlog/fmt/bin_to_hex.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bin_to_hex.h rename to inc/spdlog/fmt/bin_to_hex.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/args.h b/inc/spdlog/fmt/bundled/args.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/args.h rename to inc/spdlog/fmt/bundled/args.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/chrono.h b/inc/spdlog/fmt/bundled/chrono.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/chrono.h rename to inc/spdlog/fmt/bundled/chrono.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/color.h b/inc/spdlog/fmt/bundled/color.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/color.h rename to inc/spdlog/fmt/bundled/color.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/compile.h b/inc/spdlog/fmt/bundled/compile.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/compile.h rename to inc/spdlog/fmt/bundled/compile.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/core.h b/inc/spdlog/fmt/bundled/core.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/core.h rename to inc/spdlog/fmt/bundled/core.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/fmt.license.rst b/inc/spdlog/fmt/bundled/fmt.license.rst similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/fmt.license.rst rename to inc/spdlog/fmt/bundled/fmt.license.rst diff --git a/inc/spdlog/include/spdlog/fmt/bundled/format-inl.h b/inc/spdlog/fmt/bundled/format-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/format-inl.h rename to inc/spdlog/fmt/bundled/format-inl.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/format.h b/inc/spdlog/fmt/bundled/format.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/format.h rename to inc/spdlog/fmt/bundled/format.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/locale.h b/inc/spdlog/fmt/bundled/locale.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/locale.h rename to inc/spdlog/fmt/bundled/locale.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/os.h b/inc/spdlog/fmt/bundled/os.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/os.h rename to inc/spdlog/fmt/bundled/os.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/ostream.h b/inc/spdlog/fmt/bundled/ostream.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/ostream.h rename to inc/spdlog/fmt/bundled/ostream.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/printf.h b/inc/spdlog/fmt/bundled/printf.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/printf.h rename to inc/spdlog/fmt/bundled/printf.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/ranges.h b/inc/spdlog/fmt/bundled/ranges.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/ranges.h rename to inc/spdlog/fmt/bundled/ranges.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/std.h b/inc/spdlog/fmt/bundled/std.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/std.h rename to inc/spdlog/fmt/bundled/std.h diff --git a/inc/spdlog/include/spdlog/fmt/bundled/xchar.h b/inc/spdlog/fmt/bundled/xchar.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/bundled/xchar.h rename to inc/spdlog/fmt/bundled/xchar.h diff --git a/inc/spdlog/include/spdlog/fmt/chrono.h b/inc/spdlog/fmt/chrono.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/chrono.h rename to inc/spdlog/fmt/chrono.h diff --git a/inc/spdlog/include/spdlog/fmt/compile.h b/inc/spdlog/fmt/compile.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/compile.h rename to inc/spdlog/fmt/compile.h diff --git a/inc/spdlog/include/spdlog/fmt/fmt.h b/inc/spdlog/fmt/fmt.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/fmt.h rename to inc/spdlog/fmt/fmt.h diff --git a/inc/spdlog/include/spdlog/fmt/ostr.h b/inc/spdlog/fmt/ostr.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/ostr.h rename to inc/spdlog/fmt/ostr.h diff --git a/inc/spdlog/include/spdlog/fmt/ranges.h b/inc/spdlog/fmt/ranges.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/ranges.h rename to inc/spdlog/fmt/ranges.h diff --git a/inc/spdlog/include/spdlog/fmt/std.h b/inc/spdlog/fmt/std.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/std.h rename to inc/spdlog/fmt/std.h diff --git a/inc/spdlog/include/spdlog/fmt/xchar.h b/inc/spdlog/fmt/xchar.h similarity index 100% rename from inc/spdlog/include/spdlog/fmt/xchar.h rename to inc/spdlog/fmt/xchar.h diff --git a/inc/spdlog/include/spdlog/formatter.h b/inc/spdlog/formatter.h similarity index 100% rename from inc/spdlog/include/spdlog/formatter.h rename to inc/spdlog/formatter.h diff --git a/inc/spdlog/include/spdlog/fwd.h b/inc/spdlog/fwd.h similarity index 100% rename from inc/spdlog/include/spdlog/fwd.h rename to inc/spdlog/fwd.h diff --git a/inc/spdlog/include/spdlog/logger-inl.h b/inc/spdlog/logger-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/logger-inl.h rename to inc/spdlog/logger-inl.h diff --git a/inc/spdlog/include/spdlog/logger.h b/inc/spdlog/logger.h similarity index 100% rename from inc/spdlog/include/spdlog/logger.h rename to inc/spdlog/logger.h diff --git a/inc/spdlog/include/spdlog/pattern_formatter-inl.h b/inc/spdlog/pattern_formatter-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/pattern_formatter-inl.h rename to inc/spdlog/pattern_formatter-inl.h diff --git a/inc/spdlog/include/spdlog/pattern_formatter.h b/inc/spdlog/pattern_formatter.h similarity index 100% rename from inc/spdlog/include/spdlog/pattern_formatter.h rename to inc/spdlog/pattern_formatter.h diff --git a/inc/spdlog/include/spdlog/sinks/android_sink.h b/inc/spdlog/sinks/android_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/android_sink.h rename to inc/spdlog/sinks/android_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/ansicolor_sink-inl.h b/inc/spdlog/sinks/ansicolor_sink-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/ansicolor_sink-inl.h rename to inc/spdlog/sinks/ansicolor_sink-inl.h diff --git a/inc/spdlog/include/spdlog/sinks/ansicolor_sink.h b/inc/spdlog/sinks/ansicolor_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/ansicolor_sink.h rename to inc/spdlog/sinks/ansicolor_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/base_sink-inl.h b/inc/spdlog/sinks/base_sink-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/base_sink-inl.h rename to inc/spdlog/sinks/base_sink-inl.h diff --git a/inc/spdlog/include/spdlog/sinks/base_sink.h b/inc/spdlog/sinks/base_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/base_sink.h rename to inc/spdlog/sinks/base_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/basic_file_sink-inl.h b/inc/spdlog/sinks/basic_file_sink-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/basic_file_sink-inl.h rename to inc/spdlog/sinks/basic_file_sink-inl.h diff --git a/inc/spdlog/include/spdlog/sinks/basic_file_sink.h b/inc/spdlog/sinks/basic_file_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/basic_file_sink.h rename to inc/spdlog/sinks/basic_file_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/callback_sink.h b/inc/spdlog/sinks/callback_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/callback_sink.h rename to inc/spdlog/sinks/callback_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/daily_file_sink.h b/inc/spdlog/sinks/daily_file_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/daily_file_sink.h rename to inc/spdlog/sinks/daily_file_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/dist_sink.h b/inc/spdlog/sinks/dist_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/dist_sink.h rename to inc/spdlog/sinks/dist_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/dup_filter_sink.h b/inc/spdlog/sinks/dup_filter_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/dup_filter_sink.h rename to inc/spdlog/sinks/dup_filter_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/hourly_file_sink.h b/inc/spdlog/sinks/hourly_file_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/hourly_file_sink.h rename to inc/spdlog/sinks/hourly_file_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/kafka_sink.h b/inc/spdlog/sinks/kafka_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/kafka_sink.h rename to inc/spdlog/sinks/kafka_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/mongo_sink.h b/inc/spdlog/sinks/mongo_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/mongo_sink.h rename to inc/spdlog/sinks/mongo_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/msvc_sink.h b/inc/spdlog/sinks/msvc_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/msvc_sink.h rename to inc/spdlog/sinks/msvc_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/null_sink.h b/inc/spdlog/sinks/null_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/null_sink.h rename to inc/spdlog/sinks/null_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/ostream_sink.h b/inc/spdlog/sinks/ostream_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/ostream_sink.h rename to inc/spdlog/sinks/ostream_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/qt_sinks.h b/inc/spdlog/sinks/qt_sinks.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/qt_sinks.h rename to inc/spdlog/sinks/qt_sinks.h diff --git a/inc/spdlog/include/spdlog/sinks/ringbuffer_sink.h b/inc/spdlog/sinks/ringbuffer_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/ringbuffer_sink.h rename to inc/spdlog/sinks/ringbuffer_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/rotating_file_sink-inl.h b/inc/spdlog/sinks/rotating_file_sink-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/rotating_file_sink-inl.h rename to inc/spdlog/sinks/rotating_file_sink-inl.h diff --git a/inc/spdlog/include/spdlog/sinks/rotating_file_sink.h b/inc/spdlog/sinks/rotating_file_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/rotating_file_sink.h rename to inc/spdlog/sinks/rotating_file_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/sink-inl.h b/inc/spdlog/sinks/sink-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/sink-inl.h rename to inc/spdlog/sinks/sink-inl.h diff --git a/inc/spdlog/include/spdlog/sinks/sink.h b/inc/spdlog/sinks/sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/sink.h rename to inc/spdlog/sinks/sink.h diff --git a/inc/spdlog/include/spdlog/sinks/stdout_color_sinks-inl.h b/inc/spdlog/sinks/stdout_color_sinks-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/stdout_color_sinks-inl.h rename to inc/spdlog/sinks/stdout_color_sinks-inl.h diff --git a/inc/spdlog/include/spdlog/sinks/stdout_color_sinks.h b/inc/spdlog/sinks/stdout_color_sinks.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/stdout_color_sinks.h rename to inc/spdlog/sinks/stdout_color_sinks.h diff --git a/inc/spdlog/include/spdlog/sinks/stdout_sinks-inl.h b/inc/spdlog/sinks/stdout_sinks-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/stdout_sinks-inl.h rename to inc/spdlog/sinks/stdout_sinks-inl.h diff --git a/inc/spdlog/include/spdlog/sinks/stdout_sinks.h b/inc/spdlog/sinks/stdout_sinks.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/stdout_sinks.h rename to inc/spdlog/sinks/stdout_sinks.h diff --git a/inc/spdlog/include/spdlog/sinks/syslog_sink.h b/inc/spdlog/sinks/syslog_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/syslog_sink.h rename to inc/spdlog/sinks/syslog_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/systemd_sink.h b/inc/spdlog/sinks/systemd_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/systemd_sink.h rename to inc/spdlog/sinks/systemd_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/tcp_sink.h b/inc/spdlog/sinks/tcp_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/tcp_sink.h rename to inc/spdlog/sinks/tcp_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/udp_sink.h b/inc/spdlog/sinks/udp_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/udp_sink.h rename to inc/spdlog/sinks/udp_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/win_eventlog_sink.h b/inc/spdlog/sinks/win_eventlog_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/win_eventlog_sink.h rename to inc/spdlog/sinks/win_eventlog_sink.h diff --git a/inc/spdlog/include/spdlog/sinks/wincolor_sink-inl.h b/inc/spdlog/sinks/wincolor_sink-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/wincolor_sink-inl.h rename to inc/spdlog/sinks/wincolor_sink-inl.h diff --git a/inc/spdlog/include/spdlog/sinks/wincolor_sink.h b/inc/spdlog/sinks/wincolor_sink.h similarity index 100% rename from inc/spdlog/include/spdlog/sinks/wincolor_sink.h rename to inc/spdlog/sinks/wincolor_sink.h diff --git a/inc/spdlog/include/spdlog/spdlog-inl.h b/inc/spdlog/spdlog-inl.h similarity index 100% rename from inc/spdlog/include/spdlog/spdlog-inl.h rename to inc/spdlog/spdlog-inl.h diff --git a/inc/spdlog/include/spdlog/spdlog.h b/inc/spdlog/spdlog.h similarity index 100% rename from inc/spdlog/include/spdlog/spdlog.h rename to inc/spdlog/spdlog.h diff --git a/inc/spdlog/include/spdlog/stopwatch.h b/inc/spdlog/stopwatch.h similarity index 100% rename from inc/spdlog/include/spdlog/stopwatch.h rename to inc/spdlog/stopwatch.h diff --git a/inc/spdlog/include/spdlog/tweakme.h b/inc/spdlog/tweakme.h similarity index 100% rename from inc/spdlog/include/spdlog/tweakme.h rename to inc/spdlog/tweakme.h diff --git a/inc/spdlog/include/spdlog/version.h b/inc/spdlog/version.h similarity index 100% rename from inc/spdlog/include/spdlog/version.h rename to inc/spdlog/version.h diff --git a/src/thread_pool.cc b/src/thread_pool.cc deleted file mode 100644 index 5de8908..0000000 --- a/src/thread_pool.cc +++ /dev/null @@ -1,44 +0,0 @@ -#include "thread_pool.h" - -namespace base { -ThreadPool::~ThreadPool() { - if (cleanup_group_) { - CloseThreadpoolCleanupGroupMembers(cleanup_group_, true, NULL); - CloseThreadpoolCleanupGroup(cleanup_group_); - } - DestroyThreadpoolEnvironment(&env_); - if (pool_) { - CloseThreadpool(pool_); - } -} - -bool ThreadPool::Create(unsigned long min, unsigned long max) { - InitializeThreadpoolEnvironment(&env_); - pool_ = CreateThreadpool(NULL); - if (NULL == pool_) { - return false; - } - SetThreadpoolThreadMaximum(pool_, max); - BOOL ret = SetThreadpoolThreadMinimum(pool_, min); - if (FALSE == ret) { - return false; - } - cleanup_group_ = CreateThreadpoolCleanupGroup(); - if (NULL == cleanup_group_) { - return false; - } - SetThreadpoolCallbackPool(&env_, pool_); - SetThreadpoolCallbackCleanupGroup(&env_, cleanup_group_, NULL); - return true; -} - -bool ThreadPool::AddWork(PTP_WORK_CALLBACK callback, PVOID opt) { - PTP_WORK work = CreateThreadpoolWork(callback, opt, &env_); - if (NULL == work) { - return false; - } - SubmitThreadpoolWork(work); - return true; -} - -} // namespace base \ No newline at end of file diff --git a/wxhelper.vcxproj b/wxhelper.vcxproj index c1355f7..ff2284b 100644 --- a/wxhelper.vcxproj +++ b/wxhelper.vcxproj @@ -26,7 +26,6 @@ - @@ -119,7 +118,7 @@ ProgramDatabase Disabled stdcpp14 - inc\nlohmann\include;inc\tinyxml2;inc\mongoose;inc\lz4;inc\Detours;inc\base;inc\base64;inc;inc\spdlog\include;%(AdditionalIncludeDirectories) + inc\nlohmann;inc\tinyxml2;inc\mongoose;inc\lz4;inc\Detours;inc\base;inc\base64;inc;inc\spdlog;%(AdditionalIncludeDirectories) true @@ -144,7 +143,7 @@ Level3 ProgramDatabase stdcpp17 - inc\nlohmann\include;inc\tinyxml2;inc\mongoose;inc\lz4;inc\Detours;inc\base;inc\base64;inc;inc\spdlog\include;%(AdditionalIncludeDirectories) + inc\nlohmann;inc\tinyxml2;inc\mongoose;inc\lz4;inc\Detours;inc\base;inc\base64;inc;inc\spdlog;%(AdditionalIncludeDirectories) true diff --git a/wxhelper.vcxproj.filters b/wxhelper.vcxproj.filters index b76cd85..cebce69 100644 --- a/wxhelper.vcxproj.filters +++ b/wxhelper.vcxproj.filters @@ -36,9 +36,6 @@ Source Files - - Source Files - Source Files