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.

Sign up for GitHub

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

merge develop #14

Merged
merged 2 commits into from
Aug 7, 2024
Merged

merge develop #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
338b05d
Fix: binary compatibility (#9)
liss-h Nov 21, 2023
cb7caa9
version bump
liss-h Aug 7, 2024
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading