Skip to content
Snippets Groups Projects
Commit e80d9b64 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Fix deprecated enum arithmetic

parent 780f633b
No related branches found
No related tags found
2 merge requests!3788Draft: Update SciFi cluster monitoring,!3626Fixes for gcc 13, clang 16 and C++20
......@@ -43,7 +43,7 @@ public:
, m_TAEindex( owner, "TAEIndex", fmt::format( "TAE events{};TAE index;Events", extraInfo ),
Axis{2 * maxTAEHalfWindow + 1, -0.5f, 2 * maxTAEHalfWindow + 0.5f} )
, m_TAEErrors{owner, "TAEErrors", fmt::format( "TAE errors{};TAE errors;Events", extraInfo ),
Axis{NUM_ERRORS, -0.5f, NUM_ERRORS - 0.5f}}
Axis{NUM_ERRORS, -0.5f, static_cast<float>( NUM_ERRORS ) - 0.5f}}
, m_tae_bunch_id_not_set{owner, "TAE bunch IDs are not set"} {}
std::optional<int> fromOdin( const LHCb::ODIN& odin, LHCb::span<unsigned int> bunchIds ) const {
......
......@@ -26,8 +26,8 @@ namespace BasisFunctions {
template <typename BasicFunctionA, typename BasicFunctionB>
struct BasicFunctionProduct {
enum {
NumArgs = BasicFunctionA::NumArgs + BasicFunctionB::NumArgs,
NumValues = BasicFunctionA::NumValues * BasicFunctionB::NumValues
NumArgs = static_cast<int>( BasicFunctionA::NumArgs ) + static_cast<int>( BasicFunctionB::NumArgs ),
NumValues = static_cast<int>( BasicFunctionA::NumValues ) * static_cast<int>( BasicFunctionB::NumValues )
};
typedef typename BasicFunctionA::ArgType ArgType;
typedef typename BasicFunctionA::ValueType ValueType;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment