diff --git a/Framework/Cascade/testCascade.cc b/Framework/Cascade/testCascade.cc index 3279c42452c678019f1435511b00c1aea6803500..9d30afcefa12ac8b9a6f5b2798045cd6b1a61ccc 100644 --- a/Framework/Cascade/testCascade.cc +++ b/Framework/Cascade/testCascade.cc @@ -1,6 +1,7 @@ #include <corsika/cascade/Cascade.h> #include <corsika/geometry/LineTrajectory.h> #include <corsika/process/ProcessSequence.h> +#include <corsika/process/stack_inspector/StackInspector.h> #include <corsika/stack/super_stupid/SuperStupidStack.h> #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one diff --git a/Framework/Logging/BufferedSink.h b/Framework/Logging/BufferedSink.h index 7ad36927fec13087d8875af96279013a82003a4e..33cb1afa7b7ae0d65e0b8c173248294c008d8b26 100644 --- a/Framework/Logging/BufferedSink.h +++ b/Framework/Logging/BufferedSink.h @@ -32,7 +32,7 @@ namespace corsika::logging { inline void Add(const std::string& s) { fBuffer << s; } private: - int fSize; + unsigned int fSize; std::ostringstream fBuffer; }; diff --git a/Framework/Logging/MessageOff.h b/Framework/Logging/MessageOff.h index d60070002cbcb25e76eb641b19597bc6c2fac752..266a4b7cf5768816a68332b790b145e828a5c1c5 100644 --- a/Framework/Logging/MessageOff.h +++ b/Framework/Logging/MessageOff.h @@ -10,7 +10,7 @@ namespace corsika::logging { class MessageOff { protected: template <typename First, typename... Strings> - std::string Message(const First& arg, const Strings&... rest) { + std::string Message(const First& , const Strings&... ) { return ""; } }; diff --git a/Framework/ProcessSequence/testProcessSequence.cc b/Framework/ProcessSequence/testProcessSequence.cc index eb8a8cbb9d83dc9e208b8d68273229f03efe0a52..820dcb285aa4efaa28e07906230a79f2a0dc8d7b 100644 --- a/Framework/ProcessSequence/testProcessSequence.cc +++ b/Framework/ProcessSequence/testProcessSequence.cc @@ -16,7 +16,7 @@ public: Process1() {} void Init() {} // cout << "Process1::Init" << endl; } template <typename D, typename T, typename S> - inline EProcessReturn DoContinuous(D& d, T& t, S& s) const { + inline EProcessReturn DoContinuous(D& d, T& , S& ) const { for (int i = 0; i < 10; ++i) d.p[i] += 1 + i; return EProcessReturn::eOk; } @@ -27,7 +27,7 @@ public: Process2() {} void Init() {} // cout << "Process2::Init" << endl; } template <typename D, typename T, typename S> - inline EProcessReturn DoContinuous(D& d, T& t, S& s) const { + inline EProcessReturn DoContinuous(D& d, T& , S& ) const { for (int i = 0; i < 10; ++i) d.p[i] *= 0.7; return EProcessReturn::eOk; } @@ -38,7 +38,7 @@ public: Process3() {} void Init() {} // cout << "Process3::Init" << endl; } template <typename D, typename T, typename S> - inline EProcessReturn DoContinuous(D& d, T& t, S& s) const { + inline EProcessReturn DoContinuous(D& d, T& , S& ) const { for (int i = 0; i < 10; ++i) d.p[i] += 0.933; return EProcessReturn::eOk; } @@ -49,7 +49,7 @@ public: Process4() {} void Init() {} // cout << "Process4::Init" << endl; } template <typename D, typename T, typename S> - inline EProcessReturn DoContinuous(D& d, T& t, S& s) const { + inline EProcessReturn DoContinuous(D& d, T& , S& ) const { for (int i = 0; i < 10; ++i) d.p[i] /= 1.2; return EProcessReturn::eOk; } diff --git a/Framework/Random/RNGManager.cc b/Framework/Random/RNGManager.cc index b65f59ab5263f13801507494b5068dc04bdc5046..e28d9d57b5b02fbd698bbba5c3673573ae5cd8a4 100644 --- a/Framework/Random/RNGManager.cc +++ b/Framework/Random/RNGManager.cc @@ -23,8 +23,9 @@ std::stringstream corsika::random::RNGManager::dumpState() const { return buffer; } - +/* void corsika::random::RNGManager::SetSeedSeq(std::string const& pStreamName, std::seed_seq const& pSeedSeq) { seeds[pStreamName] = pSeedSeq; } +*/ diff --git a/Framework/Random/RNGManager.h b/Framework/Random/RNGManager.h index a3a6d4e536ef63dc3182503151171dca0a30a3ae..9d19305c93358ace03b8bde23a943ca9eb9e7616 100644 --- a/Framework/Random/RNGManager.h +++ b/Framework/Random/RNGManager.h @@ -42,7 +42,7 @@ namespace corsika::random { /** * set seed_seq of \a pStreamName to \a pSeedSeq */ - void SetSeedSeq(std::string const& pStreamName, std::seed_seq& const pSeedSeq); + //void SetSeedSeq(std::string const& pStreamName, std::seed_seq& const pSeedSeq); }; } // namespace corsika::random diff --git a/Framework/StackInterface/ParticleBase.h b/Framework/StackInterface/ParticleBase.h index aa0bb3d11a9e11369ce1fa0ac4d83092262707f5..b907129295a006a88092c6b5d0caa346b9706de0 100644 --- a/Framework/StackInterface/ParticleBase.h +++ b/Framework/StackInterface/ParticleBase.h @@ -48,6 +48,6 @@ namespace corsika::stack { int GetIndex() const { return GetIterator().GetIndex(); } }; -}; // namespace corsika::stack +} // namespace corsika::stack #endif diff --git a/Framework/StackInterface/StackIterator.h b/Framework/StackInterface/StackIterator.h index 2045f785de5c9ea18bd87d3202d9743e975b20f1..bcbb8340d6aaa02b317dbeb123a1c99bcc650a31 100644 --- a/Framework/StackInterface/StackIterator.h +++ b/Framework/StackInterface/StackIterator.h @@ -56,18 +56,18 @@ namespace corsika::stack { public: // StackIterator() : fData(0), fIndex(0) { } StackIteratorInterface(StackType& data, const int index) - : fData(&data) - , fIndex(index) {} + : fIndex(index) + , fData(&data) {} private: StackIteratorInterface(const StackIteratorInterface& mit) - : fData(mit.fData) - , fIndex(mit.fIndex) {} + : fIndex(mit.fIndex) + , fData(mit.fData) {} public: StackIteratorInterface& operator=(const StackIteratorInterface& mit) { - fData = mit.fData; fIndex = mit.fIndex; + fData = mit.fData; return *this; } diff --git a/Framework/Units/testUnits.cc b/Framework/Units/testUnits.cc index 6e77e4a01e62d2e5cd63e6ad286982fca6ef1766..225e1142619eafbfd1682ff39b9b18d6e0e9cbbe 100644 --- a/Framework/Units/testUnits.cc +++ b/Framework/Units/testUnits.cc @@ -20,6 +20,7 @@ TEST_CASE("PhysicalUnits", "[Units]") { REQUIRE(E1 == 10_GeV); LengthType l1 = 10_nm; + l1=l1; LengthType arr0[5]; arr0[0] = 5_m;