From 2d59006262d6e45f41ee325af78433475884dca4 Mon Sep 17 00:00:00 2001 From: Emma Miler Date: Fri, 2 Dec 2022 23:00:33 +0100 Subject: Move include directory (#337) * Move include directory to shared folder This commit moves the `include` directory from the NorthstarDLL project folder to the solution folder. This allows both the DLL and Launcher project to target it properly. * Fix filters * Update memalloc.h * Fix filters * Update NorthstarLauncher.vcxproj * Remove stuff from other PR * Update NorthstarLauncher.vcxproj * Update NorthstarLauncher.vcxproj * Update NorthstarDLL.vcxproj --- NorthstarDLL/include/spdlog/fmt/bundled/locale.h | 64 ------------------------ 1 file changed, 64 deletions(-) delete mode 100644 NorthstarDLL/include/spdlog/fmt/bundled/locale.h (limited to 'NorthstarDLL/include/spdlog/fmt/bundled/locale.h') diff --git a/NorthstarDLL/include/spdlog/fmt/bundled/locale.h b/NorthstarDLL/include/spdlog/fmt/bundled/locale.h deleted file mode 100644 index 7301bf92..00000000 --- a/NorthstarDLL/include/spdlog/fmt/bundled/locale.h +++ /dev/null @@ -1,64 +0,0 @@ -// Formatting library for C++ - std::locale support -// -// Copyright (c) 2012 - present, Victor Zverovich -// All rights reserved. -// -// For the license information refer to format.h. - -#ifndef FMT_LOCALE_H_ -#define FMT_LOCALE_H_ - -#include - -#include "format.h" - -FMT_BEGIN_NAMESPACE - -namespace detail { -template -std::basic_string vformat( - const std::locale& loc, basic_string_view format_str, - basic_format_args>> args) { - basic_memory_buffer buffer; - detail::vformat_to(buffer, format_str, args, detail::locale_ref(loc)); - return fmt::to_string(buffer); -} -} // namespace detail - -template > -inline std::basic_string vformat( - const std::locale& loc, const S& format_str, - basic_format_args>> args) { - return detail::vformat(loc, to_string_view(format_str), args); -} - -template > -inline std::basic_string format(const std::locale& loc, - const S& format_str, Args&&... args) { - return detail::vformat(loc, to_string_view(format_str), - fmt::make_args_checked(format_str, args...)); -} - -template , - FMT_ENABLE_IF(detail::is_output_iterator::value)> -inline OutputIt vformat_to( - OutputIt out, const std::locale& loc, const S& format_str, - basic_format_args>> args) { - decltype(detail::get_buffer(out)) buf(detail::get_buffer_init(out)); - vformat_to(buf, to_string_view(format_str), args, detail::locale_ref(loc)); - return detail::get_iterator(buf); -} - -template >::value> -inline auto format_to(OutputIt out, const std::locale& loc, - const S& format_str, Args&&... args) -> - typename std::enable_if::type { - const auto& vargs = fmt::make_args_checked(format_str, args...); - return vformat_to(out, loc, to_string_view(format_str), vargs); -} - -FMT_END_NAMESPACE - -#endif // FMT_LOCALE_H_ -- cgit v1.2.3