Skip to content
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
17 changes: 17 additions & 0 deletions include/hyprutils/memory/WeakPtr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,23 @@ namespace Hyprutils {
return *this;
}

template <typename U>
validHierarchy<const CWeakPointer<U>&> operator=(CWeakPointer<U>&& rhs) noexcept {
std::swap(impl_, rhs.impl_);
std::swap(m_data, rhs.m_data);
return *this;
}

CWeakPointer& operator=(CWeakPointer&& rhs) noexcept {
if (this == &rhs)
return *this;

std::swap(impl_, rhs.impl_);
std::swap(m_data, rhs.m_data);

return *this;
}

/* create a weak ptr from a shared ptr with assignment */
template <typename U>
validHierarchy<const CWeakPointer<U>&> operator=(const CSharedPointer<U>& rhs) {
Expand Down
65 changes: 65 additions & 0 deletions tests/memory/WeakPtrMove.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#include <hyprutils/memory/SharedPtr.hpp>
#include <hyprutils/memory/WeakPtr.hpp>

#include <gtest/gtest.h>
#include <utility>

using namespace Hyprutils::Memory;

namespace {
class IBase {
public:
virtual ~IBase() = default;
int value = 0;
};

class CDerived : public IBase {};
}

TEST(Memory, weakPointerMoveAssignment) {
auto lhsOwner = makeShared<int>(1);
auto rhsOwner = makeShared<int>(2);

CWeakPointer<int> lhs = lhsOwner;
CWeakPointer<int> rhs = rhsOwner;

auto* lhsImpl = lhs.impl_;
auto* rhsImpl = rhs.impl_;

ASSERT_EQ(lhsImpl->wref(), 1U);
ASSERT_EQ(rhsImpl->wref(), 1U);

lhs = std::move(rhs);

EXPECT_EQ(lhs.impl_, rhsImpl);
EXPECT_EQ(rhs.impl_, lhsImpl);
EXPECT_EQ(lhsImpl->wref(), 1U);
EXPECT_EQ(rhsImpl->wref(), 1U);
EXPECT_EQ(*lhs, 2);
EXPECT_EQ(*rhs, 1);
}

TEST(Memory, weakPointerConvertingMoveAssignment) {
auto lhsOwner = makeShared<CDerived>();
auto rhsOwner = makeShared<CDerived>();
lhsOwner->value = 1;
rhsOwner->value = 2;

CWeakPointer<IBase> lhs = lhsOwner;
CWeakPointer<CDerived> rhs = rhsOwner;

auto* lhsImpl = lhs.impl_;
auto* rhsImpl = rhs.impl_;

ASSERT_EQ(lhsImpl->wref(), 1U);
ASSERT_EQ(rhsImpl->wref(), 1U);

lhs = std::move(rhs);

EXPECT_EQ(lhs.impl_, rhsImpl);
EXPECT_EQ(rhs.impl_, lhsImpl);
EXPECT_EQ(lhsImpl->wref(), 1U);
EXPECT_EQ(rhsImpl->wref(), 1U);
EXPECT_EQ(lhs->value, 2);
EXPECT_EQ(rhs->value, 1);
}
Loading