From 7ae30280f3145250d0dc644b66510b80a188d786 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sun, 28 Jun 2015 16:49:35 +0200 Subject: [PATCH] Use optional::value() instead of options::get() in test cases --- test/pointer/cast_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/pointer/cast_test.cpp b/test/pointer/cast_test.cpp index f45e9738..5bc6e15b 100644 --- a/test/pointer/cast_test.cpp +++ b/test/pointer/cast_test.cpp @@ -64,7 +64,7 @@ TEST(UniquePtr_DynamicPointerMoveTest, NullPtrSelfCast) { TEST(UniqueRef_DynamicPointerMoveTest, ValidParentToChildCast) { Child *obj = new Child(); - unique_ref source(std::move(nullcheck(unique_ptr(obj)).get())); + unique_ref source(nullcheck(unique_ptr(obj)).value()); unique_ref casted = dynamic_pointer_move(source).value(); EXPECT_EQ(nullptr, source.get()); // source lost ownership EXPECT_EQ(obj, casted.get()); @@ -80,7 +80,7 @@ TEST(UniquePtr_DynamicPointerMoveTest, ValidParentToChildCast) { TEST(UniqueRef_DynamicPointerMoveTest, InvalidParentToChildCast1) { Parent *obj = new Parent(); - unique_ref source(std::move(nullcheck(unique_ptr(obj)).get())); + unique_ref source(nullcheck(unique_ptr(obj)).value()); optional> casted = dynamic_pointer_move(source); EXPECT_EQ(obj, source.get()); // source still has ownership EXPECT_EQ(none, casted); @@ -96,7 +96,7 @@ TEST(UniquePtr_DynamicPointerMoveTest, InvalidParentToChildCast1) { TEST(UniqueRef_DynamicPointerMoveTest, InvalidParentToChildCast2) { Child2 *obj = new Child2(); - unique_ref source(std::move(nullcheck(unique_ptr(obj)).get())); + unique_ref source(nullcheck(unique_ptr(obj)).value()); optional> casted = dynamic_pointer_move(source); EXPECT_EQ(obj, source.get()); // source still has ownership EXPECT_EQ(none, casted); @@ -112,7 +112,7 @@ TEST(UniquePtr_DynamicPointerMoveTest, InvalidParentToChildCast2) { TEST(UniqueRef_DynamicPointerMoveTest, ChildToParentCast) { Child *obj = new Child(); - unique_ref source(std::move(nullcheck(unique_ptr(obj)).get())); + unique_ref source(nullcheck(unique_ptr(obj)).value()); unique_ref casted = dynamic_pointer_move(source).value(); EXPECT_EQ(nullptr, source.get()); // source lost ownership EXPECT_EQ(obj, casted.get());