From a838ec20b0b5680152bb2d550744d0b4b5036276 Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Thu, 16 May 2019 12:45:06 +0200 Subject: [PATCH] clang --- Documentation/Examples/cascade_example.cc | 1 - Documentation/Examples/vertical_EAS.cc | 1 - Framework/StackInterface/testCombinedStack.cc | 3 ++- Framework/Units/PhysicalConstants.h | 2 +- Framework/Utilities/sgn.h | 12 ++++++------ Processes/EnergyLoss/EnergyLoss.h | 3 ++- Processes/Pythia/Decay.cc | 1 - 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc index cb06341c8..2ef7cdcf0 100644 --- a/Documentation/Examples/cascade_example.cc +++ b/Documentation/Examples/cascade_example.cc @@ -207,7 +207,6 @@ public: HEPEnergyType GetEmEnergy() const { return fEmEnergy; } }; - // // The example main program for a particle cascade // diff --git a/Documentation/Examples/vertical_EAS.cc b/Documentation/Examples/vertical_EAS.cc index 526498b24..d029a35cf 100644 --- a/Documentation/Examples/vertical_EAS.cc +++ b/Documentation/Examples/vertical_EAS.cc @@ -210,7 +210,6 @@ public: HEPEnergyType GetEmEnergy() const { return fEmEnergy; } }; - // // The example main program for a particle cascade // diff --git a/Framework/StackInterface/testCombinedStack.cc b/Framework/StackInterface/testCombinedStack.cc index 8fe244b66..aceccd1b4 100644 --- a/Framework/StackInterface/testCombinedStack.cc +++ b/Framework/StackInterface/testCombinedStack.cc @@ -333,7 +333,8 @@ using StackTest2 = CombinedStack<typename StackTest::StackImpl, TestStackData3, CombinedTestInterfaceType2>; #if defined(__clang__) -using StackTestView = SecondaryView<typename StackTest2::StackImpl, CombinedTestInterfaceType2>; +using StackTestView = + SecondaryView<typename StackTest2::StackImpl, CombinedTestInterfaceType2>; #elif defined(__GNUC__) || defined(__GNUG__) using StackTestView = corsika::stack::MakeView<StackTest2>::type; #endif diff --git a/Framework/Units/PhysicalConstants.h b/Framework/Units/PhysicalConstants.h index 78f9ecd35..23494f036 100644 --- a/Framework/Units/PhysicalConstants.h +++ b/Framework/Units/PhysicalConstants.h @@ -50,7 +50,7 @@ namespace corsika::units::constants { constexpr quantity<mass_d> u{Rep(1.6605402e-27L) * kilogram}; auto constexpr nucleonMass = 0.5 * (0.93827 + 0.93957) * 1e9 * electronvolt; - + // molar gas constant auto constexpr R = Rep(8.314'459'8) * joule / (mole * kelvin); diff --git a/Framework/Utilities/sgn.h b/Framework/Utilities/sgn.h index 71d5bec5b..43d9a9fad 100644 --- a/Framework/Utilities/sgn.h +++ b/Framework/Utilities/sgn.h @@ -3,12 +3,12 @@ namespace corsika::utl { -//! sign function without branches -template <typename T> -static int sgn(T val) { - return (T(0) < val) - (val < T(0)); -} + //! sign function without branches + template <typename T> + static int sgn(T val) { + return (T(0) < val) - (val < T(0)); + } -} +} // namespace corsika::utl #endif diff --git a/Processes/EnergyLoss/EnergyLoss.h b/Processes/EnergyLoss/EnergyLoss.h index 711e135f7..d0726d9d4 100644 --- a/Processes/EnergyLoss/EnergyLoss.h +++ b/Processes/EnergyLoss/EnergyLoss.h @@ -44,7 +44,8 @@ namespace corsika::process::energy_loss { static units::si::HEPEnergyType BetheBloch(setup::Stack::ParticleType const& p, const units::si::GrammageType dX); - int GetXbin(setup::Stack::ParticleType const&, setup::Trajectory const&, units::si::HEPEnergyType); + int GetXbin(setup::Stack::ParticleType const&, setup::Trajectory const&, + units::si::HEPEnergyType); units::si::HEPEnergyType fEnergyLossTot; units::si::GrammageType fdX; // profile binning diff --git a/Processes/Pythia/Decay.cc b/Processes/Pythia/Decay.cc index 670d24196..20d2aaa50 100644 --- a/Processes/Pythia/Decay.cc +++ b/Processes/Pythia/Decay.cc @@ -147,7 +147,6 @@ namespace corsika::process::pythia { // set particle stable Decay::SetStable(vP.GetPID()); - } } // namespace corsika::process::pythia -- GitLab