minor fixes for clang++

[senf.git] / senf / Scheduler / FIFORunner.cci

diff --git a/senf/Scheduler/FIFORunner.cci b/senf/Scheduler/FIFORunner.cci
index 0ddc889..138b261 100644 (file)
--- a/senf/Scheduler/FIFORunner.cci
+++ b/senf/Scheduler/FIFORunner.cci
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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 FIFORunner inline non-template implementation */
@@ -28,19 +33,25 @@
 // Custom includes
 #ifdef SENF_DEBUG
 #include <sstream>
-#include "../Utils/Backtrace.hh"
+#include <senf/Utils/Backtrace.hh>
 #endif
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //  senf::scheduler::detail::FIFORunner::TaskInfo
 
 prefix_ senf::scheduler::detail::FIFORunner::TaskInfo::TaskInfo(std::string const & name,
                                                                 Priority priority)
     : Event(name), runnable_ (false), priority_ (priority)
-{}
+{
+#ifdef SENF_BACKTRACE
+    std::stringstream ss;
+    senf::backtrace(ss, 32);
+    backtrace_ = ss.str();
+#endif
+}
 
 prefix_ senf::scheduler::detail::FIFORunner::TaskInfo::~TaskInfo()
 {}
@@ -69,11 +80,11 @@ prefix_ bool senf::scheduler::detail::FIFORunner::TaskInfo::v_enabled()
     return TaskListBase::linked();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::scheduler::detail::FIFORunner::NullTask
 
 prefix_ senf::scheduler::detail::FIFORunner::NullTask::NullTask()
-    : senf::scheduler::detail::FIFORunner::TaskInfo ("<null>") 
+    : senf::scheduler::detail::FIFORunner::TaskInfo ("<null>")
 {}
 
 prefix_ senf::scheduler::detail::FIFORunner::NullTask::~NullTask()
@@ -97,17 +108,12 @@ prefix_ std::string senf::scheduler::detail::FIFORunner::NullTask::v_info()
     return "";
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::scheduler::detail::FIFORunner
 
 prefix_ void senf::scheduler::detail::FIFORunner::enqueue(TaskInfo * task)
 {
     tasks_.insert(priorityEnd(task->priority_), *task);
-#ifdef SENF_DEBUG
-    std::stringstream ss;
-    backtrace(ss, 32);
-    task->backtrace_ = ss.str();
-#endif
 }
 
 prefix_ void senf::scheduler::detail::FIFORunner::taskTimeout(unsigned ms)
@@ -163,7 +169,7 @@ prefix_ void senf::scheduler::detail::FIFORunner::yield()
     yield_ = true;
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f