Fix 'occurred' typo

[libt2n] / src / client_wrapper.hxx

diff --git a/src/client_wrapper.hxx b/src/client_wrapper.hxx
index cb333db..73fda24 100644 (file)
--- a/src/client_wrapper.hxx
+++ b/src/client_wrapper.hxx
@@ -1,21 +1,24 @@
-/***************************************************************************
- *   Copyright (C) 2008 by Gerd v. Egidy and Reinhard Pfau                 *
- *   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_CLIENT_WRAPPER
 #define __LIBT2N_CLIENT_WRAPPER
 
@@ -55,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()
@@ -242,7 +246,7 @@ class T2nSingletonWrapper : public T2nSingletonWrapperMessages
             if (!WrappedConnection->handle(SingletonObject->Stub.get(),call))
             {
                 // create an result with default-constructor if the handler could not
-                // successfully do a call but no exception occured
+                // successfully do a call but no exception occurred
                 result=typename detail::TypeWrap<R>::type();
             }
             return result;