client_wrapper.hxx, socket_wrapper.hxx: reorder member initialization order

[libt2n] / src / socket_wrapper.hxx

diff --git a/src/socket_wrapper.hxx b/src/socket_wrapper.hxx
index 093a809..cf1d385 100644 (file)
--- a/src/socket_wrapper.hxx
+++ b/src/socket_wrapper.hxx
@@ -1,21 +1,24 @@
-/***************************************************************************
- *   Copyright (C) 2008 by Gerd v. Egidy                                   *
- *   gve@intra2net.com                                                     *
- *                                                                         *
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU Lesser General Public License for more details.                   *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this program; if not, write to the                 *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
+/*
+Copyright (C) 2006 by Intra2net AG - Gerd v. Egidy
+
+The software in this package is distributed under the GNU General
+Public License version 2 (with a special exception described below).
+
+A copy of GNU General Public License (GPL) is included in this distribution,
+in the file COPYING.GPL.
+
+As a special exception, if other files instantiate templates or use macros
+or inline functions from this file, or you compile this file and link it
+with other works to produce a work based on this file, this file
+does not by itself cause the resulting work to be covered
+by the GNU General Public License.
+
+However the source code for this file must still be made available
+in accordance with section (3) of the GNU General Public License.
+
+This exception does not invalidate any other reasons why a work based
+on this file might be covered by the GNU General Public License.
+*/
 
 #ifndef __LIBT2N_SOCKET_WRAPPER
 #define __LIBT2N_SOCKET_WRAPPER
@@ -59,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);