From 148c046a0203278a48e982de6ef4688617b2e748 Mon Sep 17 00:00:00 2001 From: AndreaRigoni Date: Fri, 3 Apr 2026 13:09:08 +0000 Subject: [PATCH] fix warnings --- src/Core/Types.h | 2 +- src/Core/testing/VectorTest.cpp | 2 +- src/HEP/Geant/EmitterPrimary.hh | 8 ++-- src/Math/Units.h | 62 +++++++++++++++---------------- src/Vtk/HEP/Geant/vtkGeantEvent.h | 2 +- src/Vtk/Math/vtkContainerBox.h | 2 +- src/Vtk/uLibVtkInterface.h | 4 +- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/Core/Types.h b/src/Core/Types.h index d854eec..d486480 100644 --- a/src/Core/Types.h +++ b/src/Core/Types.h @@ -182,7 +182,7 @@ typedef bool Bool_t; // Boolean (0=false, 1=true) (bool) \ public: \ typedef type_info::BaseClass BaseClass; \ - virtual const char *type_name() const { return type_info::name; } \ + virtual const char *type_name() const override { return type_info::name; } \ /**/ /** diff --git a/src/Core/testing/VectorTest.cpp b/src/Core/testing/VectorTest.cpp index 14324f4..ac1d1dc 100644 --- a/src/Core/testing/VectorTest.cpp +++ b/src/Core/testing/VectorTest.cpp @@ -38,7 +38,7 @@ inline const unsigned long VectorSplice(const _Tp &_it, const _Tp &_end, _Tp it = _it; _Tp end = _end - 1; - for (it; it != end;) { + for (; it != end;) { if (_comp(*it, value)) it++; else if (_comp(*end, value)) { diff --git a/src/HEP/Geant/EmitterPrimary.hh b/src/HEP/Geant/EmitterPrimary.hh index f9fd9ef..72829bb 100644 --- a/src/HEP/Geant/EmitterPrimary.hh +++ b/src/HEP/Geant/EmitterPrimary.hh @@ -32,7 +32,7 @@ class EmitterPrimary : public G4VUserPrimaryGeneratorAction, public AffineTransf virtual ~EmitterPrimary(); // Metodo principale chiamato all'inizio di ogni evento - virtual void GeneratePrimaries(G4Event*); + virtual void GeneratePrimaries(G4Event*) override; virtual void Updated() override { ULIB_SIGNAL_EMIT(EmitterPrimary::Updated); } @@ -51,7 +51,7 @@ class SkyPlaneEmitterPrimary : public EmitterPrimary SkyPlaneEmitterPrimary(); virtual ~SkyPlaneEmitterPrimary(); - virtual void GeneratePrimaries(G4Event*); + virtual void GeneratePrimaries(G4Event*) override; void SetPlane(const uLib::Vector3f& p0, const uLib::Vector3f& normal); void SetSkySize(const uLib::Vector2f& size); @@ -72,7 +72,7 @@ class CylinderEmitterPrimary : public EmitterPrimary CylinderEmitterPrimary(); virtual ~CylinderEmitterPrimary(); - virtual void GeneratePrimaries(G4Event*); + virtual void GeneratePrimaries(G4Event*) override; void SetRadius(float r); float GetRadius() const { return m_Radius; } @@ -101,7 +101,7 @@ class QuadMeshEmitterPrimary : public EmitterPrimary virtual ~QuadMeshEmitterPrimary(); // Metodo principale chiamato all'inizio di ogni evento - virtual void GeneratePrimaries(G4Event*); + virtual void GeneratePrimaries(G4Event*) override; void SetMesh(uLib::QuadMesh* mesh); diff --git a/src/Math/Units.h b/src/Math/Units.h index ad70626..a91bc61 100644 --- a/src/Math/Units.h +++ b/src/Math/Units.h @@ -13,41 +13,41 @@ namespace uLib { using namespace CLHEP; inline namespace literals { - constexpr double operator"" _m(long double v) { return static_cast(v) * CLHEP::meter; } - constexpr double operator"" _cm(long double v) { return static_cast(v) * CLHEP::centimeter; } - constexpr double operator"" _mm(long double v) { return static_cast(v) * CLHEP::millimeter; } - constexpr double operator"" _um(long double v) { return static_cast(v) * CLHEP::micrometer; } - constexpr double operator"" _nm(long double v) { return static_cast(v) * CLHEP::nanometer; } - constexpr double operator"" _km(long double v) { return static_cast(v) * CLHEP::kilometer; } + constexpr double operator""_m(long double v) { return static_cast(v) * CLHEP::meter; } + constexpr double operator""_cm(long double v) { return static_cast(v) * CLHEP::centimeter; } + constexpr double operator""_mm(long double v) { return static_cast(v) * CLHEP::millimeter; } + constexpr double operator""_um(long double v) { return static_cast(v) * CLHEP::micrometer; } + constexpr double operator""_nm(long double v) { return static_cast(v) * CLHEP::nanometer; } + constexpr double operator""_km(long double v) { return static_cast(v) * CLHEP::kilometer; } - constexpr double operator"" _m(unsigned long long v) { return static_cast(v) * CLHEP::meter; } - constexpr double operator"" _cm(unsigned long long v) { return static_cast(v) * CLHEP::centimeter; } - constexpr double operator"" _mm(unsigned long long v) { return static_cast(v) * CLHEP::millimeter; } - constexpr double operator"" _um(unsigned long long v) { return static_cast(v) * CLHEP::micrometer; } - constexpr double operator"" _nm(unsigned long long v) { return static_cast(v) * CLHEP::nanometer; } - constexpr double operator"" _km(unsigned long long v) { return static_cast(v) * CLHEP::kilometer; } + constexpr double operator""_m(unsigned long long v) { return static_cast(v) * CLHEP::meter; } + constexpr double operator""_cm(unsigned long long v) { return static_cast(v) * CLHEP::centimeter; } + constexpr double operator""_mm(unsigned long long v) { return static_cast(v) * CLHEP::millimeter; } + constexpr double operator""_um(unsigned long long v) { return static_cast(v) * CLHEP::micrometer; } + constexpr double operator""_nm(unsigned long long v) { return static_cast(v) * CLHEP::nanometer; } + constexpr double operator""_km(unsigned long long v) { return static_cast(v) * CLHEP::kilometer; } - constexpr double operator"" _deg(long double v) { return static_cast(v) * CLHEP::degree; } - constexpr double operator"" _rad(long double v) { return static_cast(v) * CLHEP::radian; } - constexpr double operator"" _deg(unsigned long long v) { return static_cast(v) * CLHEP::degree; } - constexpr double operator"" _rad(unsigned long long v) { return static_cast(v) * CLHEP::radian; } + constexpr double operator""_deg(long double v) { return static_cast(v) * CLHEP::degree; } + constexpr double operator""_rad(long double v) { return static_cast(v) * CLHEP::radian; } + constexpr double operator""_deg(unsigned long long v) { return static_cast(v) * CLHEP::degree; } + constexpr double operator""_rad(unsigned long long v) { return static_cast(v) * CLHEP::radian; } - constexpr double operator"" _ns(long double v) { return static_cast(v) * CLHEP::nanosecond; } - constexpr double operator"" _s(long double v) { return static_cast(v) * CLHEP::second; } - constexpr double operator"" _ms(long double v) { return static_cast(v) * CLHEP::millisecond; } - constexpr double operator"" _ns(unsigned long long v) { return static_cast(v) * CLHEP::nanosecond; } - constexpr double operator"" _s(unsigned long long v) { return static_cast(v) * CLHEP::second; } - constexpr double operator"" _ms(unsigned long long v) { return static_cast(v) * CLHEP::millisecond; } + constexpr double operator""_ns(long double v) { return static_cast(v) * CLHEP::nanosecond; } + constexpr double operator""_s(long double v) { return static_cast(v) * CLHEP::second; } + constexpr double operator""_ms(long double v) { return static_cast(v) * CLHEP::millisecond; } + constexpr double operator""_ns(unsigned long long v) { return static_cast(v) * CLHEP::nanosecond; } + constexpr double operator""_s(unsigned long long v) { return static_cast(v) * CLHEP::second; } + constexpr double operator""_ms(unsigned long long v) { return static_cast(v) * CLHEP::millisecond; } - constexpr double operator"" _MeV(long double v) { return static_cast(v) * CLHEP::megaelectronvolt; } - constexpr double operator"" _eV(long double v) { return static_cast(v) * CLHEP::electronvolt; } - constexpr double operator"" _keV(long double v) { return static_cast(v) * CLHEP::kiloelectronvolt; } - constexpr double operator"" _GeV(long double v) { return static_cast(v) * CLHEP::gigaelectronvolt; } - constexpr double operator"" _TeV(long double v) { return static_cast(v) * CLHEP::teraelectronvolt; } - constexpr double operator"" _MeV(unsigned long long v) { return static_cast(v) * CLHEP::megaelectronvolt; } - constexpr double operator"" _eV(unsigned long long v) { return static_cast(v) * CLHEP::electronvolt; } - constexpr double operator"" _keV(unsigned long long v) { return static_cast(v) * CLHEP::kiloelectronvolt; } - constexpr double operator"" _GeV(unsigned long long v) { return static_cast(v) * CLHEP::gigaelectronvolt; } + constexpr double operator""_MeV(long double v) { return static_cast(v) * CLHEP::megaelectronvolt; } + constexpr double operator""_eV(long double v) { return static_cast(v) * CLHEP::electronvolt; } + constexpr double operator""_keV(long double v) { return static_cast(v) * CLHEP::kiloelectronvolt; } + constexpr double operator""_GeV(long double v) { return static_cast(v) * CLHEP::gigaelectronvolt; } + constexpr double operator""_TeV(long double v) { return static_cast(v) * CLHEP::teraelectronvolt; } + constexpr double operator""_MeV(unsigned long long v) { return static_cast(v) * CLHEP::megaelectronvolt; } + constexpr double operator""_eV(unsigned long long v) { return static_cast(v) * CLHEP::electronvolt; } + constexpr double operator""_keV(unsigned long long v) { return static_cast(v) * CLHEP::kiloelectronvolt; } + constexpr double operator""_GeV(unsigned long long v) { return static_cast(v) * CLHEP::gigaelectronvolt; } } } diff --git a/src/Vtk/HEP/Geant/vtkGeantEvent.h b/src/Vtk/HEP/Geant/vtkGeantEvent.h index f139bcf..734e737 100644 --- a/src/Vtk/HEP/Geant/vtkGeantEvent.h +++ b/src/Vtk/HEP/Geant/vtkGeantEvent.h @@ -43,7 +43,7 @@ public: virtual class vtkPolyData *GetPolyData() const override; - virtual void Update(); + virtual void Update() override; protected: virtual void InstallPipe(); diff --git a/src/Vtk/Math/vtkContainerBox.h b/src/Vtk/Math/vtkContainerBox.h index e1c18e1..bf8d4a5 100644 --- a/src/Vtk/Math/vtkContainerBox.h +++ b/src/Vtk/Math/vtkContainerBox.h @@ -44,7 +44,7 @@ public: vtkContainerBox(Content *content); ~vtkContainerBox(); - virtual class vtkPolyData *GetPolyData() const; + virtual class vtkPolyData *GetPolyData() const override; /** * @brief Updates the VTK representation from the internal state. diff --git a/src/Vtk/uLibVtkInterface.h b/src/Vtk/uLibVtkInterface.h index 42ef572..3032dd0 100644 --- a/src/Vtk/uLibVtkInterface.h +++ b/src/Vtk/uLibVtkInterface.h @@ -129,10 +129,10 @@ uLibTypeMacro(Puppet, uLib::Object) vtkRendererCollection *GetRenderers() const; - const std::vector &GetDisplayProperties() const { + const std::vector &GetDisplayProperties() const override { return m_DisplayProperties; } - void RegisterDisplayProperty(uLib::PropertyBase *prop) { + void RegisterDisplayProperty(uLib::PropertyBase *prop) override { m_DisplayProperties.push_back(prop); }