diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauResult.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauResult.h index e10d5e934dfc7f6466ff9953d9b72836044d726b..9f741f66006481570b1d22e3ddd81076a46d4a18 100755 --- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauResult.h +++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/EMTauResult.h @@ -31,6 +31,11 @@ namespace ROIB { EMTauResult(); ~EMTauResult(); + EMTauResult(EMTauResult&&) noexcept = default; + EMTauResult(const EMTauResult&) = default; + EMTauResult& operator=(EMTauResult&&) noexcept =default; + EMTauResult& operator=(const EMTauResult&) =default; + /* Member function returning the header */ const Header& header() const; /* Member function returning the trailer */ diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.h index 23e35fe1404c490736bacde0e072b601a841ffd7..a6bcc6345126391ac780e9947d44735f0438fe07 100755 --- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.h +++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.h @@ -50,6 +50,11 @@ namespace ROIB { Header( const std::vector<uint32_t>& v) : m_header( v ) {} + Header(Header&&) noexcept = default; + Header(const Header&) = default; + Header& operator=(Header&&) noexcept =default; + Header& operator=(const Header&) =default; + //! constructor specifying subdet ID, event ID and version Header( const uint32_t, const uint32_t, const uint32_t ); //! constructor specifying subdet ID, event ID @@ -57,11 +62,12 @@ namespace ROIB { //! constructor specifying subdet ID only Header( const uint32_t ); + //! empty default desctructor - ~Header() {}; + ~Header() = default; //! get full header - const std::vector<uint32_t> header() const; + const std::vector<uint32_t>& header() const; //! get header(data) size int size() const; diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.icc b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.icc index bf1488d05ffe8a3206ae5873aa274c19b0b03b37..dc35066d4a382e3cfb2877be49499fa28c1f1afa 100644 --- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.icc +++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Header.icc @@ -5,7 +5,7 @@ // inline implementations -inline const std::vector<uint32_t> ROIB::Header::header() const { +inline const std::vector<uint32_t>& ROIB::Header::header() const { return m_header; } diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.h b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.h index 89fad78cffab905f9eb75e8559cb70c44550263d..4315fb9fecd634dc0d5c6d1083ec720f545725f2 100755 --- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.h +++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.h @@ -46,6 +46,11 @@ namespace ROIB { Trailer() : m_trailer() {} + Trailer(Trailer&&) noexcept = default; + Trailer(const Trailer&) = default; + Trailer& operator=(Trailer&&) noexcept =default; + Trailer& operator=(const Trailer&) =default; + //! constructor which fully specifies the initialiser values Trailer( const std::vector< uint32_t >& v) : m_trailer( v ) {} @@ -56,10 +61,11 @@ namespace ROIB { Trailer( const uint32_t ); //! empty default destructor - ~Trailer() {} + ~Trailer() = default; + //! get full trailer - const std::vector<uint32_t> trailer() const; + const std::vector<uint32_t>& trailer() const; //! get trailer/data size (should always return 5) int size() const; diff --git a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.icc b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.icc index 7cb724a62fc4de18d3283c6738e2256958cc2f60..cea37018dca8a11bde1cb69197b31cea39c544ac 100644 --- a/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.icc +++ b/Trigger/TrigT1/TrigT1Result/TrigT1Result/Trailer.icc @@ -5,7 +5,7 @@ // inline implementations -inline const std::vector<uint32_t> ROIB::Trailer::trailer() const { +inline const std::vector<uint32_t>& ROIB::Trailer::trailer() const { return m_trailer; }