summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2017-04-15 07:49:47 +0200
committerMurray Cumming <murrayc@murrayc.com>2017-04-15 07:50:19 +0200
commit80e02100f34414c6bdd46ddc4dad5117b7547743 (patch)
tree1a6847f0535aa22016b16a2d11881055fb46611f
parent1e6bca5a6b31afe8e40e3a417a8a3143d9e32415 (diff)
downloadglibmm-80e02100f34414c6bdd46ddc4dad5117b7547743.tar.gz
Variant: operator bool(): Simplify to avoid clang++ warnings.
The odd code here was necessary when this returned void*, before C++11.
-rw-r--r--glib/src/variant.ccg2
1 files changed, 1 insertions, 1 deletions
diff --git a/glib/src/variant.ccg b/glib/src/variant.ccg
index bcdc3ac1..da0587c4 100644
--- a/glib/src/variant.ccg
+++ b/glib/src/variant.ccg
@@ -247,7 +247,7 @@ VariantContainerBase::get_iter(const VariantType& container_variant_type) const
VariantBase::operator bool() const
{
- return gobj() ? GINT_TO_POINTER(1) : nullptr;
+ return gobj();
}
void