Skip to content

Commit 1c0bad2

Browse files
committed
Merge branch 'feature/tree' of github.com:qdrvm/cpp-jam into feature/tree
2 parents 7d36b1f + 986c697 commit 1c0bad2

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ project(morum
2424
VERSION 0.1.0
2525
LANGUAGES C CXX
2626
)
27-
2827
set(CMAKE_CXX_STANDARD 23)
2928
set(CMAKE_CXX_STANDARD_REQUIRED ON)
3029
set(CMAKE_CXX_EXTENSIONS OFF)

src/merkle_tree/db.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <morum/db.hpp>
88
#include <qtils/assert.hpp>
9-
#include <qtils/bytestr.hpp>
9+
#include <qtils/byte_utils.hpp>
1010
#include <qtils/macro/unwrap.hpp>
1111
#include <rocksdb/db.h>
1212
#include <rocksdb/options.h>
@@ -181,9 +181,10 @@ namespace morum {
181181
std::expected<void, StorageError> RocksDbColumnFamily::write(
182182
qtils::ByteSpan key, qtils::ByteSpan value) {
183183
rocksdb::WriteBatch updates;
184-
QTILS_UNWRAP_void(wrap_status(updates.Put(handle,
185-
rocksdb::Slice{qtils::byte2str(key)},
186-
rocksdb::Slice{qtils::byte2str(value)})));
184+
QTILS_UNWRAP_void(
185+
wrap_status(updates.Put(handle,
186+
rocksdb::Slice{qtils::byte2str(key)},
187+
rocksdb::Slice{qtils::byte2str(value)})));
187188
QTILS_UNWRAP_void(
188189
wrap_status(db->db->Write(rocksdb::WriteOptions{}, &updates)));
189190
return {};

vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@
5454
"name": "nlohmann-json",
5555
"version>=": "3.11.3"
5656
}
57-
]
57+
]
5858
}

0 commit comments

Comments
 (0)