Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ if(BUILD_TESTING AND log_surgeon_BUILD_TESTING)
set(log_surgeon_ENABLE_TESTS ON)
endif()

# Use <fmt/*.h> as <format> is unsupported in gcc-10.
find_package(fmt 8.0.1 REQUIRED)
find_package(fmt 11.2.0 REQUIRED)
message(STATUS "Found fmt ${fmt_VERSION}.")

find_package(Microsoft.GSL 4.0.0 REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Requirements:
* CMake >= 3.22.1
* GCC >= 10 or Clang >= 7
* [Catch2] >= 3.8.1
* [fmt] >= 8.0.1
* [fmt] >= 11.2.0
* [GSL] >= 4.0.0
* [Task] >= 3.38
* [uv] >= 0.7.10
Expand Down
2 changes: 1 addition & 1 deletion src/log_surgeon/finite_automata/Dfa.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#include <log_surgeon/finite_automata/TagOperation.hpp>
#include <log_surgeon/Token.hpp>

#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/ranges.h>

namespace log_surgeon::finite_automata {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/log_surgeon/finite_automata/DfaState.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <log_surgeon/finite_automata/StateType.hpp>
#include <log_surgeon/finite_automata/UnicodeIntervalTree.hpp>

#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/ranges.h>

namespace log_surgeon::finite_automata {
template <StateType state_type>
Expand Down
2 changes: 1 addition & 1 deletion src/log_surgeon/finite_automata/DfaTransition.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <log_surgeon/finite_automata/RegisterOperation.hpp>
#include <log_surgeon/finite_automata/StateType.hpp>

#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/ranges.h>

namespace log_surgeon::finite_automata {
template <StateType state_type>
Expand Down
2 changes: 1 addition & 1 deletion src/log_surgeon/finite_automata/Nfa.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <log_surgeon/types.hpp>
#include <log_surgeon/UniqueIdGenerator.hpp>

#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/ranges.h>

namespace log_surgeon::finite_automata {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <log_surgeon/finite_automata/TagOperation.hpp>

#include <fmt/format.h>
#include <fmt/ranges.h>

namespace log_surgeon::finite_automata {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/log_surgeon/finite_automata/NfaState.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <log_surgeon/finite_automata/UnicodeIntervalTree.hpp>
#include <log_surgeon/types.hpp>

#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/ranges.h>

namespace log_surgeon::finite_automata {
template <StateType state_type>
Expand Down
2 changes: 1 addition & 1 deletion src/log_surgeon/finite_automata/RegexAST.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <log_surgeon/finite_automata/TagOperation.hpp>
#include <log_surgeon/finite_automata/UnicodeIntervalTree.hpp>

#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/ranges.h>
#include <fmt/xchar.h>
#include <gsl/pointers>
Expand Down
2 changes: 1 addition & 1 deletion src/log_surgeon/finite_automata/RegisterOperation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <log_surgeon/types.hpp>

#include <fmt/core.h>
#include <fmt/format.h>

namespace log_surgeon::finite_automata {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/log_surgeon/finite_automata/TagOperation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <log_surgeon/types.hpp>

#include <fmt/core.h>
#include <fmt/format.h>

namespace log_surgeon::finite_automata {
enum class TagOperationType : uint8_t {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include <log_surgeon/wildcard_query_parser/StaticQueryToken.hpp>
#include <log_surgeon/wildcard_query_parser/VariableQueryToken.hpp>

#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/ranges.h>

using std::string;
using std::strong_ordering;
Expand Down
4 changes: 2 additions & 2 deletions taskfiles/deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ tasks:
- "-DFMT_TEST=OFF"
CMAKE_PACKAGE_NAME: "fmt"
CMAKE_SETTINGS_DIR: "{{.G_DEPS_CMAKE_SETTINGS_DIR}}"
TAR_SHA256: "b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01"
TAR_URL: "https://github.com/fmtlib/fmt/archive/refs/tags/8.0.1.tar.gz"
TAR_SHA256: "bc23066d87ab3168f27cef3e97d545fa63314f5c79df5ea444d41d56f962c6af"
TAR_URL: "https://github.com/fmtlib/fmt/archive/refs/tags/11.2.0.tar.gz"
WORK_DIR: "{{.G_DEPS_DIR}}"

install-microsoft.gsl:
Expand Down
2 changes: 1 addition & 1 deletion tests/test-buffer-parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <log_surgeon/types.hpp>

#include <catch2/catch_test_macros.hpp>
#include <fmt/core.h>
#include <fmt/format.h>

using log_surgeon::BufferParser;
using log_surgeon::capture_id_t;
Expand Down
1 change: 0 additions & 1 deletion tests/test-schema.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <log_surgeon/SchemaParser.hpp>

#include <catch2/catch_test_macros.hpp>
#include <fmt/core.h>

/**
* @defgroup unit_tests_schema Schema unit tests.
Expand Down
Loading