From 712f946c701da123c77cdd986f1180efee2f8886 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Sun, 7 Apr 2019 12:52:34 +0200
Subject: [PATCH] fixed include-reorderig bug due to clang-format
---
Environment/FlatAtmosphere/FlatAtmosphere.h | 2 --
Framework/StackInterface/SecondaryView.h | 2 +-
Framework/StackInterface/Stack.h | 1 +
Main/Environment.h | 2 --
Main/Stack.h | 2 --
5 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Environment/FlatAtmosphere/FlatAtmosphere.h b/Environment/FlatAtmosphere/FlatAtmosphere.h
index 4227e0de..6839def4 100644
--- a/Environment/FlatAtmosphere/FlatAtmosphere.h
+++ b/Environment/FlatAtmosphere/FlatAtmosphere.h
@@ -8,5 +8,3 @@
* Licence version 3 (GPL Version 3). See file LICENSE for a full version of
* the license.
*/
-
-
diff --git a/Framework/StackInterface/SecondaryView.h b/Framework/StackInterface/SecondaryView.h
index 563de915..1bbbe02c 100644
--- a/Framework/StackInterface/SecondaryView.h
+++ b/Framework/StackInterface/SecondaryView.h
@@ -54,7 +54,7 @@ namespace corsika::stack {
*/
template <typename StackDataType, template <typename> typename ParticleInterface>
- class SecondaryView : public corsika::stack::Stack<StackDataType&, ParticleInterface> {
+ class SecondaryView : public Stack<StackDataType&, ParticleInterface> {
using ViewType = SecondaryView<StackDataType, ParticleInterface>;
diff --git a/Framework/StackInterface/Stack.h b/Framework/StackInterface/Stack.h
index a666e0ff..2f183af2 100644
--- a/Framework/StackInterface/Stack.h
+++ b/Framework/StackInterface/Stack.h
@@ -13,6 +13,7 @@
#define _include_Stack_h__
#include <corsika/stack/StackIteratorInterface.h>
+// must be after StackIteratorInterface
#include <corsika/stack/SecondaryView.h>
#include <stdexcept>
diff --git a/Main/Environment.h b/Main/Environment.h
index 4227e0de..6839def4 100644
--- a/Main/Environment.h
+++ b/Main/Environment.h
@@ -8,5 +8,3 @@
* Licence version 3 (GPL Version 3). See file LICENSE for a full version of
* the license.
*/
-
-
diff --git a/Main/Stack.h b/Main/Stack.h
index 4227e0de..6839def4 100644
--- a/Main/Stack.h
+++ b/Main/Stack.h
@@ -8,5 +8,3 @@
* Licence version 3 (GPL Version 3). See file LICENSE for a full version of
* the license.
*/
-
-
--
GitLab