X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FEventManager.cc;h=db9b8efb9d8322972315a9262ad1cec90458a36f;hb=aeb7c57c3b42e83cb0b429989f9c3ab0900a76a4;hp=0b6a48263835396ccb8db46daf0138bc4b3d9034;hpb=69b25a4904fa86324aedc7147502255ce4117885;p=senf.git

diff --git a/senf/PPI/EventManager.cc b/senf/PPI/EventManager.cc
index 0b6a482..db9b8ef 100644
--- a/senf/PPI/EventManager.cc
+++ b/senf/PPI/EventManager.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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 EventManager non-inline non-template implementation */
@@ -32,14 +37,16 @@
 
 //#include "EventManager.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::EventManager
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
+bool senf::ppi::EventManager::alive_ (false);
+
 prefix_ void senf::ppi::EventManager::destroyModule(module::Module & module)
 {
     using boost::lambda::_1;
@@ -52,14 +59,17 @@ prefix_ void senf::ppi::EventManager::destroyEvent(EventDescriptor & event)
 {
     using boost::lambda::_1;
     namespace l = boost::lambda;
-    
+
     SENF_ASSERT(
         std::find_if(registrations_.begin(), registrations_.end(),
-                     l::bind(&detail::EventBindingBase::descriptor_,_1) == &event) 
-        == registrations_.end());
+                     l::bind(&detail::EventBindingBase::descriptor_,_1) == &event)
+        == registrations_.end(),
+        "Internal failure: registrations still active while destroying event."
+        "Maybe you've put the SENF_PPI_MODULE macro in a superclass instead of"
+        "in the subclass?");
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "EventManager.mpp"