From d96918a7e7107a1edd1bfa94d3bbe8227cd10d2b Mon Sep 17 00:00:00 2001
From: Dominik Baack <dominik.baack@tu-dortmund.de>
Date: Fri, 18 Sep 2020 17:00:17 +0200
Subject: [PATCH] renamed base process templates
---
Framework/ProcessSequence/ContinuousProcess.h | 10 ++++++++++
Framework/ProcessSequence/InteractionProcess.h | 14 ++++++++++++++
Framework/ProcessSequence/SecondariesProcess.h | 13 +++++++++++++
Framework/ProcessSequence/StackProcess.h | 6 ++++++
4 files changed, 43 insertions(+)
diff --git a/Framework/ProcessSequence/ContinuousProcess.h b/Framework/ProcessSequence/ContinuousProcess.h
index 9969e149e..14a632947 100644
--- a/Framework/ProcessSequence/ContinuousProcess.h
+++ b/Framework/ProcessSequence/ContinuousProcess.h
@@ -24,11 +24,21 @@ namespace corsika::process {
*/
template <typename TDerived>
+<<<<<<< HEAD
class ContinuousProcess : public BaseProcess<TDerived> {
+=======
+ class ContinuousProcess {
+>>>>>>> renamed base process templates
private:
protected:
public:
using _TDerived = TDerived;
+<<<<<<< HEAD
+=======
+
+ TDerived& GetRef() { return static_cast<TDerived&>(*this); }
+ const TDerived& GetRef() const { return static_cast<const TDerived&>(*this); }
+>>>>>>> renamed base process templates
// here starts the interface part
// -> enforce TDerived to implement DoContinuous...
diff --git a/Framework/ProcessSequence/InteractionProcess.h b/Framework/ProcessSequence/InteractionProcess.h
index f41320380..8c80ab31e 100644
--- a/Framework/ProcessSequence/InteractionProcess.h
+++ b/Framework/ProcessSequence/InteractionProcess.h
@@ -25,11 +25,25 @@ namespace corsika::process {
*/
template <typename TDerived>
+<<<<<<< HEAD
class InteractionProcess : public BaseProcess<TDerived> {
public:
using _TDerived = TDerived;
using BaseProcess<TDerived>::GetRef;
+=======
+ class InteractionProcess {
+
+ private:
+
+ protected:
+ using _TDerived = TDerived;
+
+ public:
+
+ TDerived& GetRef() { return static_cast<TDerived&>(*this); }
+ const TDerived& GetRef() const { return static_cast<const TDerived&>(*this); }
+>>>>>>> renamed base process templates
/// here starts the interface-definition part
// -> enforce TDerived to implement DoInteraction...
diff --git a/Framework/ProcessSequence/SecondariesProcess.h b/Framework/ProcessSequence/SecondariesProcess.h
index 8bfd37102..1b7e1a2f9 100644
--- a/Framework/ProcessSequence/SecondariesProcess.h
+++ b/Framework/ProcessSequence/SecondariesProcess.h
@@ -25,10 +25,23 @@ namespace corsika::process {
*/
template <typename TDerived>
+<<<<<<< HEAD
class SecondariesProcess : public BaseProcess<TDerived> {
public:
using _TDerived = TDerived;
+=======
+ class SecondariesProcess {
+
+ private:
+ protected:
+ using _TDerived = TDerived;
+
+ public:
+ TDerived& GetRef() { return static_cast<TDerived&>(*this); }
+ const TDerived& GetRef() const { return static_cast<const TDerived&>(*this); }
+
+>>>>>>> renamed base process templates
/// here starts the interface-definition part
// -> enforce TDerived to implement DoSecondaries...
template <typename TSecondaries>
diff --git a/Framework/ProcessSequence/StackProcess.h b/Framework/ProcessSequence/StackProcess.h
index 3cb33952f..011b68594 100644
--- a/Framework/ProcessSequence/StackProcess.h
+++ b/Framework/ProcessSequence/StackProcess.h
@@ -35,6 +35,12 @@ namespace corsika::process {
StackProcess(const unsigned int nStep)
: fNStep(nStep) {}
+<<<<<<< HEAD
+=======
+ TDerived& GetRef() { return static_cast<TDerived&>(*this); }
+ const TDerived& GetRef() const { return static_cast<const TDerived&>(*this); }
+
+>>>>>>> renamed base process templates
/// here starts the interface-definition part
// -> enforce TDerived to implement DoStack...
template <typename TStack>
--
GitLab