diff options
author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
---|---|---|
committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /gio/src/socket.ccg | |
parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
download | glibmm-0d5f63b18f5766760cf39e82ee11482984e0a938.tar.gz |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'gio/src/socket.ccg')
-rw-r--r-- | gio/src/socket.ccg | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gio/src/socket.ccg b/gio/src/socket.ccg index 7a4a211d..571bc00c 100644 --- a/gio/src/socket.ccg +++ b/gio/src/socket.ccg @@ -56,9 +56,9 @@ Glib::RefPtr<Socket> Socket::create_from_fd(int fd, const Glib::RefPtr<Cancellab gssize Socket::receive_from(Glib::RefPtr<SocketAddress>& address, char* buffer, gsize size, const Glib::RefPtr<Cancellable>& cancellable) { - GError* gerror = 0; - GSocketAddress* caddr = 0; - gssize retvalue = g_socket_receive_from(gobj(), &caddr, buffer, size, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)); + GError* gerror = nullptr; + GSocketAddress* caddr = nullptr; + auto retvalue = g_socket_receive_from(gobj(), &caddr, buffer, size, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -70,9 +70,9 @@ gssize Socket::receive_from(Glib::RefPtr<SocketAddress>& address, char* buffer, gssize Socket::receive_from(Glib::RefPtr<SocketAddress>& address, char* buffer, gsize size) { - GError* gerror = 0; - GSocketAddress* caddr = 0; - gssize retvalue = g_socket_receive_from(gobj(), &caddr, buffer, size, 0, &(gerror)); + GError* gerror = nullptr; + GSocketAddress* caddr = nullptr; + auto retvalue = g_socket_receive_from(gobj(), &caddr, buffer, size, 0, &(gerror)); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -85,8 +85,8 @@ gssize Socket::receive_from(Glib::RefPtr<SocketAddress>& address, char* buffer, gssize Socket::receive_with_blocking(gchar* buffer, gsize size, bool blocking, const Glib::RefPtr<Cancellable>& cancellable) { - GError* gerror = 0; - gssize const retvalue = g_socket_receive_with_blocking(gobj(), buffer, size, + GError* gerror = nullptr; + const auto retvalue = g_socket_receive_with_blocking(gobj(), buffer, size, blocking, Glib::unwrap(cancellable), &(gerror)); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -97,8 +97,8 @@ gssize Socket::receive_with_blocking(gchar* buffer, gsize size, bool blocking, gssize Socket::send_with_blocking(gchar* buffer, gsize size, bool blocking, const Glib::RefPtr<Cancellable>& cancellable) { - GError* gerror = 0; - gssize const retvalue = g_socket_send_with_blocking(gobj(), buffer, size, + GError* gerror = nullptr; + const auto retvalue = g_socket_send_with_blocking(gobj(), buffer, size, blocking, Glib::unwrap(cancellable), &(gerror)); if(gerror) ::Glib::Error::throw_exception(gerror); |