summaryrefslogtreecommitdiff
path: root/gio/src/networkaddress.ccg
diff options
context:
space:
mode:
authorMarcin Kolny <marcin.kolny@gmail.com>2015-08-08 14:45:12 +0200
committerMarcin Kolny <marcin.kolny@gmail.com>2015-08-08 14:45:59 +0200
commit0d5f63b18f5766760cf39e82ee11482984e0a938 (patch)
treee3f74b9b37e7618c92840024077dff43e6d08f0d /gio/src/networkaddress.ccg
parentdce7a844e48a582e42eb2b60eef5c1f2527540ac (diff)
parentd94115843f38967b5e883f5f7d8057882ae364cb (diff)
downloadglibmm-0d5f63b18f5766760cf39e82ee11482984e0a938.tar.gz
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'gio/src/networkaddress.ccg')
-rw-r--r--gio/src/networkaddress.ccg4
1 files changed, 2 insertions, 2 deletions
diff --git a/gio/src/networkaddress.ccg b/gio/src/networkaddress.ccg
index 182b5075..dad0dcf1 100644
--- a/gio/src/networkaddress.ccg
+++ b/gio/src/networkaddress.ccg
@@ -28,8 +28,8 @@ namespace Gio
Glib::RefPtr<NetworkAddress>
NetworkAddress::parse(const std::string& host_and_port, guint16 default_port)
{
- GError *error = 0;
- GNetworkAddress *address = G_NETWORK_ADDRESS
+ GError *error = nullptr;
+ auto *address = G_NETWORK_ADDRESS
(g_network_address_parse (host_and_port.c_str (), default_port,
&error));
if (error)