X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FEventManager.cci;h=d88db89176053d81864295d1bd3ea1b19dae8ceb;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=f75fa38537e9b4f4712f447b543ae1c4c8b960e2;hpb=3d16600678b948ff3bd0e4fd2a1a800fcc629a03;p=senf.git diff --git a/PPI/EventManager.cci b/PPI/EventManager.cci index f75fa38..d88db89 100644 --- a/PPI/EventManager.cci +++ b/PPI/EventManager.cci @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ //#include "EventManager.ih" // Custom includes -#include "Scheduler/Scheduler.hh" +#include "../Scheduler/Scheduler.hh" #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// @@ -42,7 +42,7 @@ prefix_ senf::ppi::EventManager & senf::ppi::EventManager::instance() prefix_ senf::ClockService::clock_type senf::ppi::EventManager::now() { - return Scheduler::instance().eventTime(); + return scheduler::now(); } prefix_ senf::ClockService::clock_type senf::ppi::EventManager::time()