diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-09-19 09:51:09 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-09-19 09:51:09 +0200 |
| commit | 7f5065a7de446563f303fbbdb5d28a710403c23f (patch) | |
| tree | 9b58f799cbf25ed4fec5c310668968d8ae3f191f /glib | |
| parent | 1739f07e92763d1dd9092b96f244b6647dc19c91 (diff) | |
| download | glibmm-7f5065a7de446563f303fbbdb5d28a710403c23f.tar.gz | |
Glib::Variant: Avoid warnings from clang++
Bug 787648
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/src/variant.ccg | 2 | ||||
| -rw-r--r-- | glib/src/variant.hg | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/glib/src/variant.ccg b/glib/src/variant.ccg index a645143f..856fe461 100644 --- a/glib/src/variant.ccg +++ b/glib/src/variant.ccg @@ -253,7 +253,7 @@ _DEPRECATE_IFDEF_END VariantBase::operator bool() const { - return gobj() ? GINT_TO_POINTER(1) : nullptr; + return gobj() != nullptr; } void diff --git a/glib/src/variant.hg b/glib/src/variant.hg index f4503e26..4fe57191 100644 --- a/glib/src/variant.hg +++ b/glib/src/variant.hg @@ -1624,9 +1624,8 @@ namespace detail { // swallows any argument template <class T> -constexpr int any_arg(T&& arg) +constexpr int any_arg(T&& /* arg */) { - (void)arg; return 0; } |