Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Update to fmt 10 #1427

Merged
merged 6 commits into from
Mar 15, 2024
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
1 change: 1 addition & 0 deletions cpp/arcticdb/util/allocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <folly/concurrency/ConcurrentHashMap.h>
#include <folly/ThreadCachedInt.h>

#include <fmt/std.h>

namespace arcticdb {

Expand Down
2 changes: 1 addition & 1 deletion cpp/vcpkg
Submodule vcpkg updated 3341 files
4 changes: 2 additions & 2 deletions cpp/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
{ "name": "boost-winapi", "version": "1.80.0#1" },
{ "name": "curl", "version": "8.4.0" },
{ "name": "double-conversion", "version": "3.2.1" },
{ "name": "fmt", "version": "9.1.0#1" },
{ "name": "fmt", "version": "10.2.1" },
{ "name": "folly", "version-string": "2022.10.31.00#3" },
{ "name": "gflags", "version": "2.2.2#5" },
{ "name": "glog", "version": "0.6.0#2" },
Expand All @@ -165,7 +165,7 @@
{ "name": "protobuf", "version": "3.21.8" },
{ "name": "rapidcheck", "version": "2021-12-20" },
{ "name": "s2n", "version": "1.3.5" },
{ "name": "spdlog", "version": "1.11.0" },
{ "name": "spdlog", "version": "1.13.0" },
{ "name": "xxhash", "version": "0.8.2" },
{ "name": "zlib", "version": "1.2.13" },
{ "name": "zstd", "version": "1.5.2" }
Expand Down
3 changes: 1 addition & 2 deletions environment_unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ dependencies:
- azure-storage-blobs-cpp
# RocksDB is not supported on the conda build at the moment
# - rocksdb
# ArcticDB is currently incompatible with fmt 10
- fmt < 10
- fmt
- folly==2023.09.25.00
- unordered_dense
# Vendored build dependencies (see `cpp/thirdparty` and `cpp/vcpkg.json`)
Expand Down
Loading