From bf82fa38be9c033164c50c2f90e829b9b16e6aa5 Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Thu, 31 Jan 2019 16:20:06 +0100 Subject: [PATCH] cleanup namespace injections --- Framework/Logging/Logger.h | 3 --- Framework/StackInterface/CMakeLists.txt | 1 + Framework/StackInterface/StackView.h | 23 +++++++++++++++++++++++ Processes/Sibyll/Decay.h | 1 - Processes/TrackingLine/TrackingLine.h | 2 -- 5 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 Framework/StackInterface/StackView.h diff --git a/Framework/Logging/Logger.h b/Framework/Logging/Logger.h index 7b9adc8d5..be6b3800a 100644 --- a/Framework/Logging/Logger.h +++ b/Framework/Logging/Logger.h @@ -31,9 +31,6 @@ #include <corsika/logging/NoSink.h> #include <corsika/logging/Sink.h> -using namespace std; -using namespace boost; - namespace corsika::logging { /** diff --git a/Framework/StackInterface/CMakeLists.txt b/Framework/StackInterface/CMakeLists.txt index 6fce751db..e00800819 100644 --- a/Framework/StackInterface/CMakeLists.txt +++ b/Framework/StackInterface/CMakeLists.txt @@ -1,6 +1,7 @@ set ( CORSIKAstackinterface_HEADERS Stack.h + StackView.h StackIteratorInterface.h ParticleBase.h ) diff --git a/Framework/StackInterface/StackView.h b/Framework/StackInterface/StackView.h new file mode 100644 index 000000000..f4d72e22b --- /dev/null +++ b/Framework/StackInterface/StackView.h @@ -0,0 +1,23 @@ +#ifndef _include_corsika_stack_stackview_h_ +#define _include_corsika_stack_stackview_h_ + + +namespace corsika::stack { + + template<typename Stack> + class StackView : puclic Stack { + + public: + + + + + private: + std::vector<unsigned int> fIndices; + + }; + +} + + +#endif diff --git a/Processes/Sibyll/Decay.h b/Processes/Sibyll/Decay.h index 3998cb791..eddae6138 100644 --- a/Processes/Sibyll/Decay.h +++ b/Processes/Sibyll/Decay.h @@ -90,7 +90,6 @@ namespace corsika::process { using std::cout; using std::endl; - // using namespace corsika::io; using namespace corsika::units::si; // name? also makes EM particles stable diff --git a/Processes/TrackingLine/TrackingLine.h b/Processes/TrackingLine/TrackingLine.h index b82981476..02126ee12 100644 --- a/Processes/TrackingLine/TrackingLine.h +++ b/Processes/TrackingLine/TrackingLine.h @@ -29,8 +29,6 @@ #include <stdexcept> #include <utility> -using namespace corsika; - namespace corsika::process { namespace tracking_line { -- GitLab