Skip to content

Commit

Permalink
merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Clueliss committed Nov 21, 2023
2 parents f7e6d2f + 8ffc695 commit 9f3a8e5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.22)
project(metall-ffi VERSION 0.2.2)
project(metall-ffi VERSION 0.2.3)

include(cmake/boilerplate_init.cmake)
boilerplate_init()
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Recipe(ConanFile):
generators = "CMakeDeps", "CMakeToolchain"

def requirements(self):
self.requires("metall/0.26", transitive_headers=True)
self.requires("metall/0.23.1", transitive_headers=True)
self.requires("boost/1.83.0", transitive_headers=True, force=True)

if self.options.with_test_deps:
Expand Down
2 changes: 1 addition & 1 deletion src/dice/ffi/metall_internal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace dice::metall_ffi::internal {
* @brief The metall manager type used internally.
* This object type is whats actually behind the opaque ::metall_manager * in the interface
*/
using metall_manager = metall::basic_manager<uint32_t>;
using metall_manager = metall::basic_manager<uint32_t, 1ULL << 28>;
} // namespace

#endif//DICE_METALLFFI_METALLINTERNAL_HPP

0 comments on commit 9f3a8e5

Please sign in to comment.