Skip to content

fix macos build #35

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

Closed
turuslan wants to merge 5 commits into from
Closed

fix macos build #35

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc62575
remove friend concept
turuslan Mar 14, 2025
f776b1f
fix test
turuslan Mar 19, 2025
975e6bb
missing using
turuslan Mar 19, 2025
5abc399
revert friend
turuslan Mar 19, 2025
d1987fe
revert constructor
turuslan Mar 19, 2025
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: 0 additions & 2 deletions include/scale/detail/collections.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ namespace scale {
using detail::collections::RandomExtensibleCollection;
using detail::collections::ResizeableCollection;
using detail::collections::StaticCollection;
using detail::decomposable::Decomposable;
using detail::decomposable::DecomposableArray;

/**
* @brief Encodes a dynamic collection using SCALE encoding.
Expand Down
2 changes: 0 additions & 2 deletions include/scale/detail/compact_integer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ namespace scale {
ref(temp_storage.has_value() ? temp_storage.value() : value) {}

template <typename U>
requires CompactCompatible<std::remove_cvref_t<U>>
friend decltype(auto) as_compact(U &&value);

public:
Expand Down Expand Up @@ -155,7 +154,6 @@ namespace scale {
* @return CompactReflection instance.
*/
template <typename T>
requires CompactCompatible<std::remove_cvref_t<T>>
decltype(auto) as_compact(T &&value) {
return CompactReflection<decltype(value)>(
std::forward<decltype(value)>(value));
Expand Down
5 changes: 5 additions & 0 deletions include/scale/detail/decomposable_type_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,8 @@ namespace scale::detail::decomposable {
or DecomposableAggregate<T>);

} // namespace scale::detail::decomposable

namespace scale {
using detail::decomposable::Decomposable;
using detail::decomposable::DecomposableArray;
} // namespace scale
4 changes: 2 additions & 2 deletions test/scale_sptr_and_refs_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct X {
};

TEST(SmartPointersAndRef, SharedPointer_SuccessEncode) {
std::shared_ptr<X> value = std::make_shared<X>(0xde, 0xad, 0xbe, 0xef);
std::shared_ptr<X> value = std::make_shared<X>(X{0xde, 0xad, 0xbe, 0xef});
ByteArray expected = {0xde, 0xad, 0xbe, 0xef};

ASSERT_OUTCOME_SUCCESS(encoded, encode(value));
Expand All @@ -47,7 +47,7 @@ TEST(SmartPointersAndRef, SharedPointer_SuccessDecode) {
}

TEST(SmartPointersAndRef, UniquePointer_SuccessEncode) {
std::unique_ptr<X> value = std::make_unique<X>(0xde, 0xad, 0xbe, 0xef);
std::unique_ptr<X> value = std::make_unique<X>(X{0xde, 0xad, 0xbe, 0xef});
ByteArray expected = {0xde, 0xad, 0xbe, 0xef};

ASSERT_OUTCOME_SUCCESS(encoded, encode(value));
Expand Down