Skip to content

Commit

Permalink
Fix more warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcarcell authored and tmadlener committed Jan 15, 2024
1 parent f42cd3f commit 13c9c33
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 22 deletions.
11 changes: 4 additions & 7 deletions source/include/marlin/MemoryMonitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
#include "stdio.h"
#include "string.h"

using namespace lcio ;
using namespace marlin ;


/** MemoryMonitor is a memory monitoring application for Marlin
* <h4>Input - Prerequisites</h4>
Expand All @@ -24,7 +21,7 @@ using namespace marlin ;
* @author N. Nikiforou, CERN,
*/

class MemoryMonitor : public Processor {
class MemoryMonitor : public marlin::Processor {

public:

Expand All @@ -36,13 +33,13 @@ class MemoryMonitor : public Processor {
virtual void init() ;

// Called at the beginning of every run
virtual void processRunHeader( LCRunHeader* run ) ;
virtual void processRunHeader( EVENT::LCRunHeader* run ) ;

// Run over each event - the main algorithm
virtual void processEvent( LCEvent * evt ) ;
virtual void processEvent( EVENT::LCEvent * evt ) ;

// Run at the end of each event
virtual void check( LCEvent * evt ) ;
virtual void check( EVENT::LCEvent * evt ) ;

// Called at the very end for cleanup, histogram saving, etc.
virtual void end() ;
Expand Down
12 changes: 4 additions & 8 deletions test/marlintest/include/TestEventModifier.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
#include <string>


using namespace lcio ;
using namespace marlin ;


/** Example processor for marlin.
*
* If compiled with MARLIN_USE_AIDA
Expand All @@ -29,7 +25,7 @@ using namespace marlin ;
* @version $Id: TestEventModifier.h,v 1.4 2005-10-11 12:57:39 gaede Exp $
*/

class TestEventModifier : public Processor, public EventModifier {
class TestEventModifier : public marlin::Processor, public marlin::EventModifier {

public:

Expand All @@ -56,14 +52,14 @@ class TestEventModifier : public Processor, public EventModifier {

/** Called for every run.
*/
virtual void processRunHeader( LCRunHeader* run ) ;
virtual void processRunHeader( EVENT::LCRunHeader* run ) ;

/** Called for every event - the working horse.
*/
virtual void processEvent( LCEvent * evt ) ;
virtual void processEvent( EVENT::LCEvent * evt ) ;


virtual void check( LCEvent * evt ) ;
virtual void check( EVENT::LCEvent * evt ) ;


/** Called after data processing for clean up.
Expand Down
11 changes: 4 additions & 7 deletions test/marlintest/include/TestProcessorEventSeeder.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@
#include <map>
#include <vector>

using namespace lcio ;
using namespace marlin ;


/** test processor for testing the uniquie event seeding functionality of the ProcessorEventSeeder service in Marlin.
*
*
* @author S. J. Aplin, DESY
*/

class TestProcessorEventSeeder : public Processor {
class TestProcessorEventSeeder : public marlin::Processor {

public:

Expand All @@ -42,14 +39,14 @@ class TestProcessorEventSeeder : public Processor {

/** Called for every run.
*/
virtual void processRunHeader( LCRunHeader* run ) ;
virtual void processRunHeader( EVENT::LCRunHeader* run ) ;

/** Called for every event - the working horse.
*/
virtual void processEvent( LCEvent * evt ) ;
virtual void processEvent( EVENT::LCEvent * evt ) ;


virtual void check( LCEvent * evt ) ;
virtual void check( EVENT::LCEvent * evt ) ;


/** Called after data processing for clean up.
Expand Down

0 comments on commit 13c9c33

Please sign in to comment.