X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FException.cc;h=ec299e5b808e1521418bedc358361fc1653960ca;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=ee1ec18609494f6d39e666eaf05f0fc09bdcbb18;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Exception.cc b/senf/Utils/Exception.cc
index ee1ec18..ec299e5 100644
--- a/senf/Utils/Exception.cc
+++ b/senf/Utils/Exception.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@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):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Exception non-inline non-template implementation */
@@ -27,22 +32,23 @@
 //#include "Exception.ih"
 
 // Custom includes
-#include <execinfo.h>
+#ifdef SENF_BACKTRACE
+   #include <execinfo.h>
+#endif
 #include <sstream>
-#include "../config.hh"
 #include "Backtrace.hh"
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Exception
 
-#ifdef SENF_DEBUG
+#ifdef SENF_BACKTRACE
 prefix_ void senf::ExceptionMixin::addBacktrace()
 {
     void * entries[SENF_DEBUG_BACKTRACE_NUMCALLERS];
-    unsigned nEntries( ::backtrace(entries, SENF_DEBUG_BACKTRACE_NUMCALLERS) );
+    int nEntries (::backtrace(entries, SENF_DEBUG_BACKTRACE_NUMCALLERS));
 
     std::stringstream ss;
     ss << "\nException at\n";
@@ -54,7 +60,7 @@ prefix_ void senf::ExceptionMixin::addBacktrace()
 }
 #endif
 
-/////////////////////////////////////////////////////////////////////////// 
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::Exception
 
 prefix_ senf::Exception::~Exception()
@@ -67,7 +73,7 @@ prefix_ char const * senf::Exception::what()
     return what_.c_str();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::SystemException
 
 prefix_ void senf::SystemException::init(std::string const & descr, int code
@@ -82,7 +88,7 @@ prefix_ void senf::SystemException::init(std::string const & descr, int code
     if (! descr.empty()) (*this) << " " << descr;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_