diff options
author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2025-03-10 10:52:51 +0000 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@rspamd.com> | 2025-03-10 10:52:51 +0000 |
commit | 27498df9be766547e32d5f18f497bc22e8da3eb3 (patch) | |
tree | 5ee629c72fbfb3ada6000163cc38bd97f6a806f3 /src/libserver | |
parent | 0eda20643559d0aa6e1204b483e1b1ece421fd80 (diff) | |
download | rspamd-vstakhov-fmt-embedding.tar.gz rspamd-vstakhov-fmt-embedding.zip |
[Fix] Use bundled libfmt everywherevstakhov-fmt-embedding
Issue: #5258
Diffstat (limited to 'src/libserver')
-rw-r--r-- | src/libserver/backtrace.cxx | 4 | ||||
-rw-r--r-- | src/libserver/cfg_rcl.cxx | 4 | ||||
-rw-r--r-- | src/libserver/cfg_utils.cxx | 4 | ||||
-rw-r--r-- | src/libserver/css/css_parser.cxx | 4 | ||||
-rw-r--r-- | src/libserver/css/css_selector.cxx | 4 | ||||
-rw-r--r-- | src/libserver/css/css_value.cxx | 4 | ||||
-rw-r--r-- | src/libserver/html/html.cxx | 12 | ||||
-rw-r--r-- | src/libserver/html/html_tests.cxx | 4 | ||||
-rw-r--r-- | src/libserver/hyperscan_tools.cxx | 4 | ||||
-rw-r--r-- | src/libserver/symcache/symcache_impl.cxx | 4 | ||||
-rw-r--r-- | src/libserver/symcache/symcache_item.cxx | 4 |
11 files changed, 26 insertions, 26 deletions
diff --git a/src/libserver/backtrace.cxx b/src/libserver/backtrace.cxx index c24e61936..5ebde677e 100644 --- a/src/libserver/backtrace.cxx +++ b/src/libserver/backtrace.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ #ifdef BACKWARD_ENABLE #include "contrib/backward-cpp/backward.hpp" -#include "fmt/base.h" +#include "contrib/fmt/include/fmt/base.h" #include "logger.h" namespace rspamd { diff --git a/src/libserver/cfg_rcl.cxx b/src/libserver/cfg_rcl.cxx index 6ea8945ab..f38366908 100644 --- a/src/libserver/cfg_rcl.cxx +++ b/src/libserver/cfg_rcl.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ #include <algorithm>// for std::transform #include <memory> #include "contrib/ankerl/unordered_dense.h" -#include "fmt/base.h" +#include "contrib/fmt/include/fmt/base.h" #include "libutil/cxx/util.hxx" #include "libutil/cxx/file_util.hxx" #include "frozen/unordered_set.h" diff --git a/src/libserver/cfg_utils.cxx b/src/libserver/cfg_utils.cxx index 9612cdae4..dfbdc6bee 100644 --- a/src/libserver/cfg_utils.cxx +++ b/src/libserver/cfg_utils.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,7 +65,7 @@ #include <string> #include <string_view> #include <vector> -#include "fmt/base.h" +#include "contrib/fmt/include/fmt/base.h" #include "cxx/util.hxx" #include "frozen/unordered_map.h" #include "frozen/string.h" diff --git a/src/libserver/css/css_parser.cxx b/src/libserver/css/css_parser.cxx index 11fa830f0..ade499ba4 100644 --- a/src/libserver/css/css_parser.cxx +++ b/src/libserver/css/css_parser.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ #include "css_rule.hxx" #include "css_util.hxx" #include "css.hxx" -#include "fmt/base.h" +#include "contrib/fmt/include/fmt/base.h" #include <vector> #include <unicode/utf8.h> diff --git a/src/libserver/css/css_selector.cxx b/src/libserver/css/css_selector.cxx index d2ae093cb..527b12377 100644 --- a/src/libserver/css/css_selector.cxx +++ b/src/libserver/css/css_selector.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ #include "css_selector.hxx" #include "css.hxx" #include "libserver/html/html.hxx" -#include "fmt/base.h" +#include "contrib/fmt/include/fmt/base.h" #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL #include "doctest/doctest.h" diff --git a/src/libserver/css/css_value.cxx b/src/libserver/css/css_value.cxx index f2ff55363..52a61d3b6 100644 --- a/src/libserver/css/css_value.cxx +++ b/src/libserver/css/css_value.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ #include "frozen/string.h" #include "libutil/util.h" #include "contrib/ankerl/unordered_dense.h" -#include "fmt/base.h" +#include "contrib/fmt/include/fmt/base.h" #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL #include "doctest/doctest.h" diff --git a/src/libserver/html/html.cxx b/src/libserver/html/html.cxx index 0fe31c2a3..93d1fdf91 100644 --- a/src/libserver/html/html.cxx +++ b/src/libserver/html/html.cxx @@ -1,11 +1,11 @@ -/*- - * Copyright 2021 Vsevolod Stakhov +/* + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -35,9 +35,9 @@ #include "html_tag.hxx" #include "html_url.hxx" -#include <frozen/unordered_map.h> -#include <frozen/string.h> -#include <fmt/core.h> +#include "contrib/frozen/include/frozen/unordered_map.h" +#include "contrib/frozen/include/frozen/string.h" +#include "contrib/fmt/include/fmt/core.h" #include <unicode/uversion.h> diff --git a/src/libserver/html/html_tests.cxx b/src/libserver/html/html_tests.cxx index 00595feaa..3be836a2d 100644 --- a/src/libserver/html/html_tests.cxx +++ b/src/libserver/html/html_tests.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ #include "libserver/task.h" #include <vector> -#include <fmt/core.h> +#include "contrib/fmt/include/fmt/core.h" #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL diff --git a/src/libserver/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx index 5035bee2c..75863bf39 100644 --- a/src/libserver/hyperscan_tools.cxx +++ b/src/libserver/hyperscan_tools.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ #include <filesystem> #include "contrib/ankerl/unordered_dense.h" #include "contrib/ankerl/svector.h" -#include "fmt/base.h" +#include "contrib/fmt/include/fmt/base.h" #include "libutil/cxx/file_util.hxx" #include "libutil/cxx/error.hxx" #include "hs.h" diff --git a/src/libserver/symcache/symcache_impl.cxx b/src/libserver/symcache/symcache_impl.cxx index 7159555d2..4d17348c2 100644 --- a/src/libserver/symcache/symcache_impl.cxx +++ b/src/libserver/symcache/symcache_impl.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ #include "unix-std.h" #include "libutil/cxx/file_util.hxx" #include "libutil/cxx/util.hxx" -#include "fmt/base.h" +#include "contrib/fmt/include/fmt/base.h" #include "contrib/t1ha/t1ha.h" #ifdef __has_include diff --git a/src/libserver/symcache/symcache_item.cxx b/src/libserver/symcache/symcache_item.cxx index 233e8113a..f58332ea5 100644 --- a/src/libserver/symcache/symcache_item.cxx +++ b/src/libserver/symcache/symcache_item.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2024 Vsevolod Stakhov + * Copyright 2025 Vsevolod Stakhov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ #include "lua/lua_common.h" #include "symcache_internal.hxx" #include "symcache_item.hxx" -#include "fmt/base.h" +#include "contrib/fmt/include/fmt/base.h" #include "libserver/task.h" #include "libutil/cxx/util.hxx" #include <numeric> |