commit 7116d3b: [Minor] Use header only mode for fmt
Vsevolod Stakhov
vsevolod at rspamd.com
Fri Jun 10 20:49:04 UTC 2022
Author: Vsevolod Stakhov
Date: 2022-06-10 21:45:04 +0100
URL: https://github.com/rspamd/rspamd/commit/7116d3b8fe6605817d3fd9760562883d1976fa4c (HEAD -> master)
[Minor] Use header only mode for fmt
---
CMakeLists.txt | 2 +-
contrib/fmt/CMakeLists.txt | 316 ---------------------------------------
contrib/fmt/src/format.cc | 124 ----------------
contrib/fmt/src/os.cc | 361 ---------------------------------------------
src/CMakeLists.txt | 1 -
5 files changed, 1 insertion(+), 803 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76d52130d..bf862f500 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,6 +255,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_C_OPT_FLAGS} ${CMAKE_CXX_FLAGS}")
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
ADD_DEFINITIONS(-DDOCTEST_CONFIG_NO_MULTI_LANE_ATOMICS)
+ADD_DEFINITIONS(-DFMT_HEADER_ONLY)
# Workaround for https://github.com/onqtam/doctest/issues/356
ADD_DEFINITIONS(-DDOCTEST_CONFIG_USE_STD_HEADERS)
ADD_DEFINITIONS(-DU_CHARSET_IS_UTF8)
@@ -614,7 +615,6 @@ ADD_SUBDIRECTORY(contrib/kann)
ADD_SUBDIRECTORY(contrib/fastutf8)
ADD_SUBDIRECTORY(contrib/google-ced)
IF(SYSTEM_FMT MATCHES "OFF")
- ADD_SUBDIRECTORY(contrib/fmt)
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/fmt/include")
ELSE()
find_package(fmt)
diff --git a/contrib/fmt/CMakeLists.txt b/contrib/fmt/CMakeLists.txt
deleted file mode 100644
index b05a024a7..000000000
--- a/contrib/fmt/CMakeLists.txt
+++ /dev/null
@@ -1,316 +0,0 @@
-cmake_minimum_required(VERSION 3.1...3.18)
-
-# Fallback for using newer policies on CMake <3.12.
-if(${CMAKE_VERSION} VERSION_LESS 3.12)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-endif()
-
-# Determine if fmt is built as a subproject (using add_subdirectory)
-# or if it is the master project.
-set(MASTER_PROJECT OFF)
-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
- set(MASTER_PROJECT ON)
- message(STATUS "CMake version: ${CMAKE_VERSION}")
-endif ()
-
-# Joins arguments and places the results in ${result_var}.
-function(join result_var)
- set(result )
- foreach (arg ${ARGN})
- set(result "${result}${arg}")
- endforeach ()
- set(${result_var} "${result}" PARENT_SCOPE)
-endfunction()
-
-include(CMakeParseArguments)
-
-# Sets a cache variable with a docstring joined from multiple arguments:
-# set(<variable> <value>... CACHE <type> <docstring>...)
-# This allows splitting a long docstring for readability.
-function(set_verbose)
- # cmake_parse_arguments is broken in CMake 3.4 (cannot parse CACHE) so use
- # list instead.
- list(GET ARGN 0 var)
- list(REMOVE_AT ARGN 0)
- list(GET ARGN 0 val)
- list(REMOVE_AT ARGN 0)
- list(REMOVE_AT ARGN 0)
- list(GET ARGN 0 type)
- list(REMOVE_AT ARGN 0)
- join(doc ${ARGN})
- set(${var} ${val} CACHE ${type} ${doc})
-endfunction()
-
-# Set the default CMAKE_BUILD_TYPE to Release.
-# This should be done before the project command since the latter can set
-# CMAKE_BUILD_TYPE itself (it does so for nmake).
-if (MASTER_PROJECT AND NOT CMAKE_BUILD_TYPE)
- set_verbose(CMAKE_BUILD_TYPE Release CACHE STRING
- "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or "
- "CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
-endif ()
-
-project(FMT CXX)
-include(GNUInstallDirs)
-set_verbose(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING
- "Installation directory for include files, a relative path that "
- "will be joined with ${CMAKE_INSTALL_PREFIX} or an absolute path.")
-
-option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF)
-option(FMT_WERROR "Halt the compilation with an error on compiler warnings."
- OFF)
-
-# Options that control generation of various targets.
-option(FMT_DOC "Generate the doc target." ${MASTER_PROJECT})
-option(FMT_INSTALL "Generate the install target." ${MASTER_PROJECT})
-option(FMT_TEST "Generate the test target." ${MASTER_PROJECT})
-option(FMT_FUZZ "Generate the fuzz target." OFF)
-option(FMT_CUDA_TEST "Generate the cuda-test target." OFF)
-option(FMT_OS "Include core requiring OS (Windows/Posix) " ON)
-
-# Get version from core.h
-file(READ include/fmt/core.h core_h)
-if (NOT core_h MATCHES "FMT_VERSION ([0-9]+)([0-9][0-9])([0-9][0-9])")
- message(FATAL_ERROR "Cannot get FMT_VERSION from core.h.")
-endif ()
-# Use math to skip leading zeros if any.
-math(EXPR CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1})
-math(EXPR CPACK_PACKAGE_VERSION_MINOR ${CMAKE_MATCH_2})
-math(EXPR CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_3})
-join(FMT_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.
- ${CPACK_PACKAGE_VERSION_PATCH})
-message(STATUS "Version: ${FMT_VERSION}")
-
-message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
-
-if (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-endif ()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
- set(PEDANTIC_COMPILE_FLAGS -pedantic-errors -Wall -Wextra -pedantic
- -Wold-style-cast -Wundef
- -Wredundant-decls -Wwrite-strings -Wpointer-arith
- -Wcast-qual -Wformat=2 -Wmissing-include-dirs
- -Wcast-align
- -Wctor-dtor-privacy -Wdisabled-optimization
- -Winvalid-pch -Woverloaded-virtual
- -Wconversion -Wswitch-enum -Wundef
- -Wno-ctor-dtor-privacy -Wno-format-nonliteral)
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
- set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wnoexcept
- -Wno-dangling-else -Wno-unused-local-typedefs)
- endif ()
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
- set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wdouble-promotion
- -Wtrampolines -Wzero-as-null-pointer-constant -Wuseless-cast
- -Wvector-operation-performance -Wsized-deallocation)
- endif ()
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
- set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wshift-overflow=2
- -Wnull-dereference -Wduplicated-cond)
- endif ()
- set(WERROR_FLAG -Werror)
-endif ()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -pedantic -Wconversion -Wundef
- -Wdeprecated -Wweak-vtables)
- set(WERROR_FLAG -Werror)
-endif ()
-
-if (MSVC)
- set(PEDANTIC_COMPILE_FLAGS /W3)
- set(WERROR_FLAG /WX)
-endif ()
-
-set(strtod_l_headers stdlib.h)
-if (APPLE)
- set(strtod_l_headers ${strtod_l_headers} xlocale.h)
-endif ()
-
-include(CheckSymbolExists)
-if (WIN32)
- check_symbol_exists(_strtod_l "${strtod_l_headers}" HAVE_STRTOD_L)
-else ()
- check_symbol_exists(strtod_l "${strtod_l_headers}" HAVE_STRTOD_L)
-endif ()
-
-function(add_headers VAR)
- set(headers ${${VAR}})
- foreach (header ${ARGN})
- set(headers ${headers} include/fmt/${header})
- endforeach()
- set(${VAR} ${headers} PARENT_SCOPE)
-endfunction()
-
-# Define the fmt library, its includes and the needed defines.
-add_headers(FMT_HEADERS chrono.h color.h compile.h core.h format.h format-inl.h
- locale.h os.h ostream.h posix.h printf.h ranges.h)
-if (FMT_OS)
- set(FMT_SOURCES src/format.cc src/os.cc)
-else()
- set(FMT_SOURCES src/format.cc)
-endif ()
-
-add_library(fmt ${FMT_SOURCES} ${FMT_HEADERS} README.rst)
-add_library(fmt::fmt ALIAS fmt)
-
-if (HAVE_STRTOD_L)
- target_compile_definitions(fmt PUBLIC FMT_LOCALE)
-endif ()
-
-if (FMT_WERROR)
- target_compile_options(fmt PRIVATE ${WERROR_FLAG})
-endif ()
-if (FMT_PEDANTIC)
- target_compile_options(fmt PRIVATE ${PEDANTIC_COMPILE_FLAGS})
-endif ()
-
-target_compile_features(fmt INTERFACE ${FMT_REQUIRED_FEATURES})
-
-target_include_directories(fmt PUBLIC
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:${FMT_INC_DIR}>)
-
-set(FMT_DEBUG_POSTFIX d CACHE STRING "Debug library postfix.")
-
-set_target_properties(fmt PROPERTIES
- VERSION ${FMT_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}
- DEBUG_POSTFIX "${FMT_DEBUG_POSTFIX}")
-
-# Set FMT_LIB_NAME for pkg-config fmt.pc. We cannot use the OUTPUT_NAME target
-# property because it's not set by default.
-set(FMT_LIB_NAME fmt)
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
- set(FMT_LIB_NAME ${FMT_LIB_NAME}${FMT_DEBUG_POSTFIX})
-endif ()
-
-if (BUILD_SHARED_LIBS)
- if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" AND
- NOT EMSCRIPTEN)
- # Fix rpmlint warning:
- # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0 /lib/libm.so.6.
- target_link_libraries(fmt -Wl,--as-needed)
- endif ()
- target_compile_definitions(fmt PRIVATE FMT_EXPORT INTERFACE FMT_SHARED)
-endif ()
-if (FMT_SAFE_DURATION_CAST)
- target_compile_definitions(fmt PUBLIC FMT_SAFE_DURATION_CAST)
-endif()
-
-add_library(fmt-header-only INTERFACE)
-add_library(fmt::fmt-header-only ALIAS fmt-header-only)
-
-target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1)
-target_compile_features(fmt-header-only INTERFACE ${FMT_REQUIRED_FEATURES})
-
-target_include_directories(fmt-header-only INTERFACE
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:${FMT_INC_DIR}>)
-
-# Install targets.
-if (FMT_INSTALL)
- include(CMakePackageConfigHelpers)
- set_verbose(FMT_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/fmt CACHE STRING
- "Installation directory for cmake files, a relative path that "
- "will be joined with ${CMAKE_INSTALL_PREFIX} or an absolute "
- "path.")
- set(version_config ${PROJECT_BINARY_DIR}/fmt-config-version.cmake)
- set(project_config ${PROJECT_BINARY_DIR}/fmt-config.cmake)
- set(pkgconfig ${PROJECT_BINARY_DIR}/fmt.pc)
- set(targets_export_name fmt-targets)
-
- set_verbose(FMT_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING
- "Installation directory for libraries, a relative path that "
- "will be joined to ${CMAKE_INSTALL_PREFIX} or an absolute path.")
-
- set_verbose(FMT_PKGCONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig CACHE PATH
- "Installation directory for pkgconfig (.pc) files, a relative "
- "path that will be joined with ${CMAKE_INSTALL_PREFIX} or an "
- "absolute path.")
-
- # Generate the version, config and target files into the build directory.
- write_basic_package_version_file(
- ${version_config}
- VERSION ${FMT_VERSION}
- COMPATIBILITY AnyNewerVersion)
-
- join_paths(libdir_for_pc_file "\${exec_prefix}" "${FMT_LIB_DIR}")
- join_paths(includedir_for_pc_file "\${prefix}" "${FMT_INC_DIR}")
-
- configure_file(
- "${PROJECT_SOURCE_DIR}/support/cmake/fmt.pc.in"
- "${pkgconfig}"
- @ONLY)
- configure_package_config_file(
- ${PROJECT_SOURCE_DIR}/support/cmake/fmt-config.cmake.in
- ${project_config}
- INSTALL_DESTINATION ${FMT_CMAKE_DIR})
-
- set(INSTALL_TARGETS fmt fmt-header-only)
- # Use a namespace because CMake provides better diagnostics for namespaced
- # imported targets.
- export(TARGETS ${INSTALL_TARGETS} NAMESPACE fmt::
- FILE ${PROJECT_BINARY_DIR}/${targets_export_name}.cmake)
-
- # Install version, config and target files.
- install(
- FILES ${project_config} ${version_config}
- DESTINATION ${FMT_CMAKE_DIR})
- install(EXPORT ${targets_export_name} DESTINATION ${FMT_CMAKE_DIR}
- NAMESPACE fmt::)
-
- # Install the library and headers.
- install(TARGETS ${INSTALL_TARGETS} EXPORT ${targets_export_name}
- LIBRARY DESTINATION ${FMT_LIB_DIR}
- ARCHIVE DESTINATION ${FMT_LIB_DIR}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
- install(FILES $<TARGET_PDB_FILE:${INSTALL_TARGETS}>
- DESTINATION ${FMT_LIB_DIR} OPTIONAL)
- install(FILES ${FMT_HEADERS} DESTINATION "${FMT_INC_DIR}/fmt")
- install(FILES "${pkgconfig}" DESTINATION "${FMT_PKGCONFIG_DIR}")
-endif ()
-
-if (FMT_DOC)
- add_subdirectory(doc)
-endif ()
-
-if (FMT_TEST)
- enable_testing()
- add_subdirectory(test)
-endif ()
-
-# Control fuzzing independent of the unit tests.
-if (FMT_FUZZ)
- add_subdirectory(test/fuzzing)
-
- # The FMT_FUZZ macro is used to prevent resource exhaustion in fuzzing
- # mode and make fuzzing practically possible. It is similar to
- # FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION but uses a different name to
- # avoid interfering with fuzzing of projects that use {fmt}.
- # See also https://llvm.org/docs/LibFuzzer.html#fuzzer-friendly-build-mode.
- target_compile_definitions(fmt PUBLIC FMT_FUZZ)
-endif ()
-
-set(gitignore ${PROJECT_SOURCE_DIR}/.gitignore)
-if (MASTER_PROJECT AND EXISTS ${gitignore})
- # Get the list of ignored files from .gitignore.
- file (STRINGS ${gitignore} lines)
- list(REMOVE_ITEM lines /doc/html)
- foreach (line ${lines})
- string(REPLACE "." "[.]" line "${line}")
- string(REPLACE "*" ".*" line "${line}")
- set(ignored_files ${ignored_files} "${line}$" "${line}/")
- endforeach ()
- set(ignored_files ${ignored_files}
- /.git /breathe /format-benchmark sphinx/ .buildinfo .doctrees)
-
- set(CPACK_SOURCE_GENERATOR ZIP)
- set(CPACK_SOURCE_IGNORE_FILES ${ignored_files})
- set(CPACK_SOURCE_PACKAGE_FILE_NAME fmt-${FMT_VERSION})
- set(CPACK_PACKAGE_NAME fmt)
- set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.rst)
- include(CPack)
-endif ()
diff --git a/contrib/fmt/src/format.cc b/contrib/fmt/src/format.cc
deleted file mode 100644
index ecb8cc79a..000000000
--- a/contrib/fmt/src/format.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Formatting library for C++
-//
-// Copyright (c) 2012 - 2016, Victor Zverovich
-// All rights reserved.
-//
-// For the license information refer to format.h.
-
-#include "fmt/format-inl.h"
-
-FMT_BEGIN_NAMESPACE
-namespace detail {
-
-// DEPRECATED!
-template <typename T = void> struct basic_data {
- FMT_API static constexpr const char digits[100][2] = {
- {'0', '0'}, {'0', '1'}, {'0', '2'}, {'0', '3'}, {'0', '4'}, {'0', '5'},
- {'0', '6'}, {'0', '7'}, {'0', '8'}, {'0', '9'}, {'1', '0'}, {'1', '1'},
- {'1', '2'}, {'1', '3'}, {'1', '4'}, {'1', '5'}, {'1', '6'}, {'1', '7'},
- {'1', '8'}, {'1', '9'}, {'2', '0'}, {'2', '1'}, {'2', '2'}, {'2', '3'},
- {'2', '4'}, {'2', '5'}, {'2', '6'}, {'2', '7'}, {'2', '8'}, {'2', '9'},
- {'3', '0'}, {'3', '1'}, {'3', '2'}, {'3', '3'}, {'3', '4'}, {'3', '5'},
- {'3', '6'}, {'3', '7'}, {'3', '8'}, {'3', '9'}, {'4', '0'}, {'4', '1'},
- {'4', '2'}, {'4', '3'}, {'4', '4'}, {'4', '5'}, {'4', '6'}, {'4', '7'},
- {'4', '8'}, {'4', '9'}, {'5', '0'}, {'5', '1'}, {'5', '2'}, {'5', '3'},
- {'5', '4'}, {'5', '5'}, {'5', '6'}, {'5', '7'}, {'5', '8'}, {'5', '9'},
- {'6', '0'}, {'6', '1'}, {'6', '2'}, {'6', '3'}, {'6', '4'}, {'6', '5'},
- {'6', '6'}, {'6', '7'}, {'6', '8'}, {'6', '9'}, {'7', '0'}, {'7', '1'},
- {'7', '2'}, {'7', '3'}, {'7', '4'}, {'7', '5'}, {'7', '6'}, {'7', '7'},
- {'7', '8'}, {'7', '9'}, {'8', '0'}, {'8', '1'}, {'8', '2'}, {'8', '3'},
- {'8', '4'}, {'8', '5'}, {'8', '6'}, {'8', '7'}, {'8', '8'}, {'8', '9'},
- {'9', '0'}, {'9', '1'}, {'9', '2'}, {'9', '3'}, {'9', '4'}, {'9', '5'},
- {'9', '6'}, {'9', '7'}, {'9', '8'}, {'9', '9'}};
- FMT_API static constexpr const char hex_digits[] = "0123456789abcdef";
- FMT_API static constexpr const char signs[4] = {0, '-', '+', ' '};
- FMT_API static constexpr const char left_padding_shifts[5] = {31, 31, 0, 1,
- 0};
- FMT_API static constexpr const char right_padding_shifts[5] = {0, 31, 0, 1,
- 0};
- FMT_API static constexpr const unsigned prefixes[4] = {0, 0, 0x1000000u | '+',
- 0x1000000u | ' '};
-};
-
-#ifdef FMT_SHARED
-// Required for -flto, -fivisibility=hidden and -shared to work
-extern template struct basic_data<void>;
-#endif
-
-#if __cplusplus < 201703L
-// DEPRECATED! These are here only for ABI compatiblity.
-template <typename T> constexpr const char basic_data<T>::digits[][2];
-template <typename T> constexpr const char basic_data<T>::hex_digits[];
-template <typename T> constexpr const char basic_data<T>::signs[];
-template <typename T> constexpr const char basic_data<T>::left_padding_shifts[];
-template <typename T>
-constexpr const char basic_data<T>::right_padding_shifts[];
-template <typename T> constexpr const unsigned basic_data<T>::prefixes[];
-#endif
-
-template <typename T>
-int format_float(char* buf, std::size_t size, const char* format, int precision,
- T value) {
-#ifdef FMT_FUZZ
- if (precision > 100000)
- throw std::runtime_error(
- "fuzz mode - avoid large allocation inside snprintf");
-#endif
- // Suppress the warning about nonliteral format string.
- int (*snprintf_ptr)(char*, size_t, const char*, ...) = FMT_SNPRINTF;
- return precision < 0 ? snprintf_ptr(buf, size, format, value)
- : snprintf_ptr(buf, size, format, precision, value);
-}
-
-template FMT_API dragonbox::decimal_fp<float> dragonbox::to_decimal(float x)
- FMT_NOEXCEPT;
-template FMT_API dragonbox::decimal_fp<double> dragonbox::to_decimal(double x)
- FMT_NOEXCEPT;
-} // namespace detail
-
-// Workaround a bug in MSVC2013 that prevents instantiation of format_float.
-int (*instantiate_format_float)(double, int, detail::float_specs,
- detail::buffer<char>&) = detail::format_float;
-
-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
-template FMT_API detail::locale_ref::locale_ref(const std::locale& loc);
-template FMT_API std::locale detail::locale_ref::get<std::locale>() const;
-#endif
-
-// Explicit instantiations for char.
-
-template FMT_API auto detail::thousands_sep_impl(locale_ref)
- -> thousands_sep_result<char>;
-template FMT_API char detail::decimal_point_impl(locale_ref);
-
-template FMT_API void detail::buffer<char>::append(const char*, const char*);
-
-// DEPRECATED!
-// There is no correspondent extern template in format.h because of
-// incompatibility between clang and gcc (#2377).
-template FMT_API void detail::vformat_to(
- detail::buffer<char>&, string_view,
- basic_format_args<FMT_BUFFER_CONTEXT(char)>, detail::locale_ref);
-
-template FMT_API int detail::snprintf_float(double, int, detail::float_specs,
- detail::buffer<char>&);
-template FMT_API int detail::snprintf_float(long double, int,
- detail::float_specs,
- detail::buffer<char>&);
-template FMT_API int detail::format_float(double, int, detail::float_specs,
- detail::buffer<char>&);
-template FMT_API int detail::format_float(long double, int, detail::float_specs,
- detail::buffer<char>&);
-
-// Explicit instantiations for wchar_t.
-
-template FMT_API auto detail::thousands_sep_impl(locale_ref)
- -> thousands_sep_result<wchar_t>;
-template FMT_API wchar_t detail::decimal_point_impl(locale_ref);
-
-template FMT_API void detail::buffer<wchar_t>::append(const wchar_t*,
- const wchar_t*);
-
-template struct detail::basic_data<void>;
-
-FMT_END_NAMESPACE
diff --git a/contrib/fmt/src/os.cc b/contrib/fmt/src/os.cc
deleted file mode 100644
index 04b4dc506..000000000
--- a/contrib/fmt/src/os.cc
+++ /dev/null
@@ -1,361 +0,0 @@
-// Formatting library for C++ - optional OS-specific functionality
-//
-// Copyright (c) 2012 - 2016, Victor Zverovich
-// All rights reserved.
-//
-// For the license information refer to format.h.
-
-// Disable bogus MSVC warnings.
-#if !defined(_CRT_SECURE_NO_WARNINGS) && defined(_MSC_VER)
-# define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "fmt/os.h"
-
-#include <climits>
-
-#if FMT_USE_FCNTL
-# include <sys/stat.h>
-# include <sys/types.h>
-
-# ifndef _WIN32
-# include <unistd.h>
-# else
-# ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-# endif
-# include <io.h>
-
-# ifndef S_IRUSR
-# define S_IRUSR _S_IREAD
-# endif
-# ifndef S_IWUSR
-# define S_IWUSR _S_IWRITE
-# endif
-# ifndef S_IRGRP
-# define S_IRGRP 0
-# endif
-# ifndef S_IROTH
-# define S_IROTH 0
-# endif
-# endif // _WIN32
-#endif // FMT_USE_FCNTL
-
-#ifdef _WIN32
-# include <windows.h>
-#endif
-
-#ifdef fileno
-# undef fileno
-#endif
-
-namespace {
-#ifdef _WIN32
-// Return type of read and write functions.
-using rwresult = int;
-
-// On Windows the count argument to read and write is unsigned, so convert
-// it from size_t preventing integer overflow.
-inline unsigned convert_rwcount(std::size_t count) {
- return count <= UINT_MAX ? static_cast<unsigned>(count) : UINT_MAX;
-}
-#elif FMT_USE_FCNTL
-// Return type of read and write functions.
-using rwresult = ssize_t;
-
-inline std::size_t convert_rwcount(std::size_t count) { return count; }
-#endif
-} // namespace
-
-FMT_BEGIN_NAMESPACE
-
-#ifdef _WIN32
-detail::utf16_to_utf8::utf16_to_utf8(basic_string_view<wchar_t> s) {
- if (int error_code = convert(s)) {
- FMT_THROW(windows_error(error_code,
- "cannot convert string from UTF-16 to UTF-8"));
- }
-}
-
-int detail::utf16_to_utf8::convert(basic_string_view<wchar_t> s) {
- if (s.size() > INT_MAX) return ERROR_INVALID_PARAMETER;
- int s_size = static_cast<int>(s.size());
- if (s_size == 0) {
- // WideCharToMultiByte does not support zero length, handle separately.
- buffer_.resize(1);
- buffer_[0] = 0;
- return 0;
- }
-
- int length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, nullptr, 0,
- nullptr, nullptr);
- if (length == 0) return GetLastError();
- buffer_.resize(length + 1);
- length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, &buffer_[0],
- length, nullptr, nullptr);
- if (length == 0) return GetLastError();
- buffer_[length] = 0;
- return 0;
-}
-
-namespace detail {
-
-class system_message {
- system_message(const system_message&) = delete;
- void operator=(const system_message&) = delete;
-
- unsigned long result_;
- wchar_t* message_;
-
- static bool is_whitespace(wchar_t c) FMT_NOEXCEPT {
- return c == L' ' || c == L'\n' || c == L'\r' || c == L'\t' || c == L'\0';
- }
-
- public:
- explicit system_message(unsigned long error_code)
- : result_(0), message_(nullptr) {
- result_ = FormatMessageW(
- FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- nullptr, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- reinterpret_cast<wchar_t*>(&message_), 0, nullptr);
- if (result_ != 0) {
- while (result_ != 0 && is_whitespace(message_[result_ - 1])) {
- --result_;
- }
- }
- }
- ~system_message() { LocalFree(message_); }
- explicit operator bool() const FMT_NOEXCEPT { return result_ != 0; }
- operator basic_string_view<wchar_t>() const FMT_NOEXCEPT {
- return basic_string_view<wchar_t>(message_, result_);
- }
-};
-
-class utf8_system_category final : public std::error_category {
- public:
- const char* name() const FMT_NOEXCEPT override { return "system"; }
- std::string message(int error_code) const override {
- system_message msg(error_code);
- if (msg) {
- utf16_to_utf8 utf8_message;
- if (utf8_message.convert(msg) == ERROR_SUCCESS) {
- return utf8_message.str();
- }
- }
- return "unknown error";
- }
-};
-
-} // namespace detail
-
-FMT_API const std::error_category& system_category() FMT_NOEXCEPT {
- static const detail::utf8_system_category category;
- return category;
-}
-
-std::system_error vwindows_error(int err_code, string_view format_str,
- format_args args) {
- auto ec = std::error_code(err_code, system_category());
- return std::system_error(ec, vformat(format_str, args));
-}
-
-void detail::format_windows_error(detail::buffer<char>& out, int error_code,
- const char* message) FMT_NOEXCEPT {
- FMT_TRY {
- system_message msg(error_code);
- if (msg) {
- utf16_to_utf8 utf8_message;
- if (utf8_message.convert(msg) == ERROR_SUCCESS) {
- format_to(buffer_appender<char>(out), "{}: {}", message, utf8_message);
- return;
- }
- }
- }
- FMT_CATCH(...) {}
- format_error_code(out, error_code, message);
-}
-
-void report_windows_error(int error_code, const char* message) FMT_NOEXCEPT {
- report_error(detail::format_windows_error, error_code, message);
-}
-#endif // _WIN32
-
-buffered_file::~buffered_file() FMT_NOEXCEPT {
- if (file_ && FMT_SYSTEM(fclose(file_)) != 0)
- report_system_error(errno, "cannot close file");
-}
-
-buffered_file::buffered_file(cstring_view filename, cstring_view mode) {
- FMT_RETRY_VAL(file_, FMT_SYSTEM(fopen(filename.c_str(), mode.c_str())),
- nullptr);
- if (!file_)
- FMT_THROW(system_error(errno, "cannot open file {}", filename.c_str()));
-}
-
-void buffered_file::close() {
- if (!file_) return;
- int result = FMT_SYSTEM(fclose(file_));
- file_ = nullptr;
- if (result != 0) FMT_THROW(system_error(errno, "cannot close file"));
-}
-
-// A macro used to prevent expansion of fileno on broken versions of MinGW.
-#define FMT_ARGS
-
-int buffered_file::fileno() const {
- int fd = FMT_POSIX_CALL(fileno FMT_ARGS(file_));
- if (fd == -1) FMT_THROW(system_error(errno, "cannot get file descriptor"));
*** OUTPUT TRUNCATED, 165 LINES SKIPPED ***
More information about the Commits
mailing list