Merge branch 'gabime:v1.x' into v1.x

LuisaGroup · Dec 28, 2023 · 4657a4f · 4657a4f
2 parents 13a9854 + c1569a3
commit 4657a4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/example/example.cpp b/example/example.cpp
@@ -180,7 +180,7 @@ void async_example() {
 #if !defined SPDLOG_USE_STD_FORMAT || defined(_MSC_VER)
     #include "spdlog/fmt/bin_to_hex.h"
 void binary_example() {
-    std::vector<char> buf(80);
+    std::vector<char> buf;
     for (int i = 0; i < 80; i++) {
         buf.push_back(static_cast<char>(i & 0xff));
     }

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -19,7 +19,10 @@ if(Catch2_FOUND)
 else()
     message(STATUS "Bundled version of Catch will be downloaded and used.")
     include(FetchContent)
-    FetchContent_Declare(Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git GIT_TAG v3.3.2)
+    FetchContent_Declare(Catch2
+            GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+            GIT_TAG 53d0d913a422d356b23dd927547febdf69ee9081 # v3.5.0
+    )
     FetchContent_MakeAvailable(Catch2)
 endif()