From 13c9c33d6281f8798a7af5e4fc988dad7a668236 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 15 Jan 2024 08:46:33 +0100 Subject: [PATCH] Fix more warnings --- source/include/marlin/MemoryMonitor.h | 11 ++++------- test/marlintest/include/TestEventModifier.h | 12 ++++-------- test/marlintest/include/TestProcessorEventSeeder.h | 11 ++++------- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/source/include/marlin/MemoryMonitor.h b/source/include/marlin/MemoryMonitor.h index 8f8190a8..bd24655a 100644 --- a/source/include/marlin/MemoryMonitor.h +++ b/source/include/marlin/MemoryMonitor.h @@ -8,9 +8,6 @@ #include "stdio.h" #include "string.h" -using namespace lcio ; -using namespace marlin ; - /** MemoryMonitor is a memory monitoring application for Marlin *

Input - Prerequisites

@@ -24,7 +21,7 @@ using namespace marlin ; * @author N. Nikiforou, CERN, */ -class MemoryMonitor : public Processor { +class MemoryMonitor : public marlin::Processor { public: @@ -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() ; diff --git a/test/marlintest/include/TestEventModifier.h b/test/marlintest/include/TestEventModifier.h index ec8de1be..ea7ff747 100644 --- a/test/marlintest/include/TestEventModifier.h +++ b/test/marlintest/include/TestEventModifier.h @@ -8,10 +8,6 @@ #include -using namespace lcio ; -using namespace marlin ; - - /** Example processor for marlin. * * If compiled with MARLIN_USE_AIDA @@ -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: @@ -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. diff --git a/test/marlintest/include/TestProcessorEventSeeder.h b/test/marlintest/include/TestProcessorEventSeeder.h index 6e252dc5..6912cf6b 100644 --- a/test/marlintest/include/TestProcessorEventSeeder.h +++ b/test/marlintest/include/TestProcessorEventSeeder.h @@ -10,9 +10,6 @@ #include #include -using namespace lcio ; -using namespace marlin ; - /** test processor for testing the uniquie event seeding functionality of the ProcessorEventSeeder service in Marlin. * @@ -20,7 +17,7 @@ using namespace marlin ; * @author S. J. Aplin, DESY */ -class TestProcessorEventSeeder : public Processor { +class TestProcessorEventSeeder : public marlin::Processor { public: @@ -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.