summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2011-03-27 22:21:50 +0200
committerMurray Cumming <murrayc@murrayc.com>2011-03-27 22:21:50 +0200
commite7d1d034a5327b05680009af16a061c967203627 (patch)
tree20d8da456790a1b28e74e3868790d90eaa2f368e
parent3a2586801cf6cf01546f332058ee04d7d505e6ab (diff)
downloadglibmm-e7d1d034a5327b05680009af16a061c967203627.tar.gz
Avoid use of NULL in C++
-rw-r--r--gio/src/fileoutputstream.hg2
-rw-r--r--glib/src/variant.hg2
2 files changed, 2 insertions, 2 deletions
diff --git a/gio/src/fileoutputstream.hg b/gio/src/fileoutputstream.hg
index abfc53ed..2c639e3a 100644
--- a/gio/src/fileoutputstream.hg
+++ b/gio/src/fileoutputstream.hg
@@ -108,7 +108,7 @@ public:
* For the synchronous version of this function,
* see query_info().
*
- * If @a cancellable is not %NULL, then the operation can be cancelled by
+ * The operation can be cancelled by
* triggering the cancellable object from another thread. If the operation
* was cancelled, a Gio::Error with CANCELLED may be thrown
*
diff --git a/glib/src/variant.hg b/glib/src/variant.hg
index bccfda14..22c5d7a5 100644
--- a/glib/src/variant.hg
+++ b/glib/src/variant.hg
@@ -176,7 +176,7 @@ template<class V_CastTo>
V_CastTo VariantBase::cast_dynamic(const VariantBase& v)
throw(std::bad_cast)
{
- if(v.gobj() == NULL)
+ if(!(v.gobj()))
{
return V_CastTo();
}