The branch, master has been updated
via 44b4600fd51677e54dd167734ca9252b58237cda (commit)
from ce44999e70624278911ab8bcc67881268665c30f (commit)
- Log -----------------------------------------------------------------
commit 44b4600fd51677e54dd167734ca9252b58237cda
Author: Philipp Gesang <philipp.gesang@xxxxxxxxxxxxx>
Date: Mon Sep 8 12:08:29 2014 +0200
client_wrapper.hxx, socket_wrapper.hxx: reorder member initialization order
This pleases GCC so we can include the headers while compiling
with ``-Wall -Werror``.
-----------------------------------------------------------------------
Summary of changes:
src/client_wrapper.hxx | 7 ++++---
src/socket_wrapper.hxx | 15 +++++++++++----
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/client_wrapper.hxx b/src/client_wrapper.hxx
index ab8aa83..50d5df6 100644
--- a/src/client_wrapper.hxx
+++ b/src/client_wrapper.hxx
@@ -58,9 +58,10 @@ class ConnectionWrapper
public:
ConnectionWrapper()
- : log_level(none), logstream(NULL),
-
command_timeout_usec(command_client::command_timeout_usec_default),
- hello_timeout_usec(command_client::hello_timeout_usec_default)
+ :
command_timeout_usec(command_client::command_timeout_usec_default),
+ hello_timeout_usec(command_client::hello_timeout_usec_default),
+ log_level(none),
+ logstream(NULL)
{ }
virtual ~ConnectionWrapper()
diff --git a/src/socket_wrapper.hxx b/src/socket_wrapper.hxx
index 82b8354..cf1d385 100644
--- a/src/socket_wrapper.hxx
+++ b/src/socket_wrapper.hxx
@@ -62,15 +62,22 @@ class BasicSocketWrapper : public ConnectionWrapper
BasicSocketWrapper(int _port, const std::string& _server="127.0.0.1",
long long
_connect_timeout_usec=socket_client_connection::connect_timeout_usec_default,
int _max_retries=socket_client_connection::max_retries_default)
- : port(_port), server(_server),
connect_timeout_usec(_connect_timeout_usec),
- max_retries(_max_retries), socket_type(tcp_s),
ConnectionWrapper()
+ : ConnectionWrapper(),
+ socket_type(tcp_s),
+ server(_server),
+ port(_port),
+ connect_timeout_usec(_connect_timeout_usec),
+ max_retries(_max_retries)
{ }
BasicSocketWrapper(const std::string& _path,
long long
_connect_timeout_usec=socket_client_connection::connect_timeout_usec_default,
int _max_retries=socket_client_connection::max_retries_default)
- : path(_path), connect_timeout_usec(_connect_timeout_usec),
- max_retries(_max_retries), socket_type(unix_s),
ConnectionWrapper()
+ : ConnectionWrapper(),
+ socket_type(unix_s),
+ path(_path),
+ connect_timeout_usec(_connect_timeout_usec),
+ max_retries(_max_retries)
{ }
client_connection* get_connection(void);
hooks/post-receive
--
C++ inter-process communication library
--
libt2n-git - see http://www.intra2net.com/en/developer/libt2n for details.
To unsubscribe send a mail to libt2n-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|