X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FException.cci;h=6a79f8cf812b2cf58fe7392576b82c4efdf631d9;hb=refs%2Fheads%2Fmaster;hp=6f7e13dc08ebf1c27bc44766b761d05d44393d30;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Exception.cci b/senf/Utils/Exception.cci
index 6f7e13d..6a79f8c 100644
--- a/senf/Utils/Exception.cci
+++ b/senf/Utils/Exception.cci
@@ -2,20 +2,26 @@
 //
 // Copyright (C) 2006 Stefan Bund <g0dil@senf.berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program 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 General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU 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.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
 
 /** \file
     \brief Exception inline non-template implementation */
@@ -25,15 +31,15 @@
 #include <cstring>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ExceptionMixin
 
 prefix_ senf::ExceptionMixin::ExceptionMixin(std::string const & description)
     : what_(description)
 {
-#ifdef SENF_DEBUG
+#ifdef SENF_BACKTRACE
     addBacktrace();
 #endif
 }
@@ -63,14 +69,14 @@ prefix_ void senf::ExceptionMixin::append(std::string text)
     what_ += text;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Exception
 
 prefix_ senf::Exception::Exception(std::string const & description)
     : ExceptionMixin(description)
 {}
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::SystemException
 
 prefix_ senf::SystemException::SystemException(std::string const & descr _SENF_EXC_DEBUG_ARGS_ND)
@@ -83,7 +89,7 @@ prefix_ senf::SystemException::SystemException(int code _SENF_EXC_DEBUG_ARGS_ND)
     init("", code _SENF_EXC_DEBUG_ARGS_P);
 }
 
-prefix_ senf::SystemException::SystemException(std::string const & descr, int code 
+prefix_ senf::SystemException::SystemException(std::string const & descr, int code
                                                _SENF_EXC_DEBUG_ARGS_ND)
 {
     init(descr, code _SENF_EXC_DEBUG_ARGS_P);
@@ -103,8 +109,9 @@ prefix_ char const * senf::SystemException::errorString()
 
 prefix_ bool senf::SystemException::anyOf(int c0, int c1, int c2, int c3, int c4, int c5,
                                           int c6, int c7, int c8, int c9)
+    const
 {
-    return 
+    return
         (c0 && code_ == c0) ||
         (c1 && code_ == c1) ||
         (c2 && code_ == c2) ||
@@ -121,7 +128,7 @@ prefix_  senf::SystemException::~SystemException()
     throw()
 {}
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_