summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2016-04-10 12:46:27 +0200
committerMurray Cumming <murrayc@murrayc.com>2016-04-10 12:46:27 +0200
commit4fe5aa8a909152b869308879bf00a6bddcd5e990 (patch)
tree62000200f80267022d1f8348ed8d2e69384b1793 /tests
parent5347f982a97c2ec69203965398063a9757de5e5d (diff)
downloadglibmm-4fe5aa8a909152b869308879bf00a6bddcd5e990.tar.gz
glibmm_weakref: Don't try to use moved-from RefPtrs.
Diffstat (limited to 'tests')
-rw-r--r--tests/glibmm_weakref/main.cc21
1 files changed, 6 insertions, 15 deletions
diff --git a/tests/glibmm_weakref/main.cc b/tests/glibmm_weakref/main.cc
index 20a80310..ae8edf14 100644
--- a/tests/glibmm_weakref/main.cc
+++ b/tests/glibmm_weakref/main.cc
@@ -67,38 +67,29 @@ main(int, char**)
// Move construction.
Glib::WeakRef<Gio::MemoryInputStream> weakmemstream3(std::move(weakmemstream1));
- if (weakmemstream1.get() || !weakmemstream3.get())
+ if (!weakmemstream3.get())
{
success = false;
- if (weakmemstream1.get())
- std::cout << "weakmemstream1 || !weakmemstream3: weakmemstream1" << std::endl;
- if (!weakmemstream3.get())
- std::cout << "weakmemstream1 || !weakmemstream3: !weakmemstream3" << std::endl;
+ std::cout << "weakmemstream1 || !weakmemstream3: !weakmemstream3" << std::endl;
}
else
{
// Move assignment.
weakmemstream2 = std::move(weakmemstream3);
- if (!weakmemstream2 || weakmemstream3)
+ if (!weakmemstream2)
{
success = false;
- if (!weakmemstream2.get())
- std::cout << "!weakmemstream2 || weakmemstream3: !weakmemstream2" << std::endl;
- if (weakmemstream3.get())
- std::cout << "!weakmemstream2 || weakmemstream3: weakmemstream3" << std::endl;
+ std::cout << "!weakmemstream2 || weakmemstream3: !weakmemstream2" << std::endl;
}
else
{
// Downcast move, followed by upcast.
weakstream1 = std::move(weakmemstream2);
weakmemstream1 = Glib::WeakRef<Gio::MemoryInputStream>::cast_dynamic(weakstream1);
- if (weakmemstream2 || !weakmemstream1)
+ if (!weakmemstream1)
{
success = false;
- if (weakmemstream2)
- std::cout << "weakmemstream2 || !weakmemstream1: weakmemstream2" << std::endl;
- if (!weakmemstream1)
- std::cout << "weakmemstream2 || !weakmemstream1: !weakmemstream1" << std::endl;
+ std::cout << "weakmemstream2 || !weakmemstream1: !weakmemstream1" << std::endl;
}
}
}