summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2016-04-10 12:46:27 +0200
committerMurray Cumming <murrayc@murrayc.com>2016-12-11 21:43:40 +0100
commit30b95005256ceb844d5571b86425764bb4d29522 (patch)
tree78f3911e6376f88da26c71f075a61221289a055b
parent8d7a0dc8428677def97b5f7b68c690830c244192 (diff)
downloadglibmm-30b95005256ceb844d5571b86425764bb4d29522.tar.gz
glibmm_weakref: Don't try to use moved-from RefPtrs.
-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;
}
}
}