fix warnings
This commit is contained in:
@@ -182,7 +182,7 @@ typedef bool Bool_t; // Boolean (0=false, 1=true) (bool)
|
|||||||
\
|
\
|
||||||
public: \
|
public: \
|
||||||
typedef type_info::BaseClass BaseClass; \
|
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; } \
|
||||||
/**/
|
/**/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ inline const unsigned long VectorSplice(const _Tp &_it, const _Tp &_end,
|
|||||||
|
|
||||||
_Tp it = _it;
|
_Tp it = _it;
|
||||||
_Tp end = _end - 1;
|
_Tp end = _end - 1;
|
||||||
for (it; it != end;) {
|
for (; it != end;) {
|
||||||
if (_comp(*it, value))
|
if (_comp(*it, value))
|
||||||
it++;
|
it++;
|
||||||
else if (_comp(*end, value)) {
|
else if (_comp(*end, value)) {
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ class EmitterPrimary : public G4VUserPrimaryGeneratorAction, public AffineTransf
|
|||||||
virtual ~EmitterPrimary();
|
virtual ~EmitterPrimary();
|
||||||
|
|
||||||
// Metodo principale chiamato all'inizio di ogni evento
|
// 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); }
|
virtual void Updated() override { ULIB_SIGNAL_EMIT(EmitterPrimary::Updated); }
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ class SkyPlaneEmitterPrimary : public EmitterPrimary
|
|||||||
SkyPlaneEmitterPrimary();
|
SkyPlaneEmitterPrimary();
|
||||||
virtual ~SkyPlaneEmitterPrimary();
|
virtual ~SkyPlaneEmitterPrimary();
|
||||||
|
|
||||||
virtual void GeneratePrimaries(G4Event*);
|
virtual void GeneratePrimaries(G4Event*) override;
|
||||||
|
|
||||||
void SetPlane(const uLib::Vector3f& p0, const uLib::Vector3f& normal);
|
void SetPlane(const uLib::Vector3f& p0, const uLib::Vector3f& normal);
|
||||||
void SetSkySize(const uLib::Vector2f& size);
|
void SetSkySize(const uLib::Vector2f& size);
|
||||||
@@ -72,7 +72,7 @@ class CylinderEmitterPrimary : public EmitterPrimary
|
|||||||
CylinderEmitterPrimary();
|
CylinderEmitterPrimary();
|
||||||
virtual ~CylinderEmitterPrimary();
|
virtual ~CylinderEmitterPrimary();
|
||||||
|
|
||||||
virtual void GeneratePrimaries(G4Event*);
|
virtual void GeneratePrimaries(G4Event*) override;
|
||||||
|
|
||||||
void SetRadius(float r);
|
void SetRadius(float r);
|
||||||
float GetRadius() const { return m_Radius; }
|
float GetRadius() const { return m_Radius; }
|
||||||
@@ -101,7 +101,7 @@ class QuadMeshEmitterPrimary : public EmitterPrimary
|
|||||||
virtual ~QuadMeshEmitterPrimary();
|
virtual ~QuadMeshEmitterPrimary();
|
||||||
|
|
||||||
// Metodo principale chiamato all'inizio di ogni evento
|
// Metodo principale chiamato all'inizio di ogni evento
|
||||||
virtual void GeneratePrimaries(G4Event*);
|
virtual void GeneratePrimaries(G4Event*) override;
|
||||||
|
|
||||||
void SetMesh(uLib::QuadMesh* mesh);
|
void SetMesh(uLib::QuadMesh* mesh);
|
||||||
|
|
||||||
|
|||||||
@@ -13,41 +13,41 @@ namespace uLib {
|
|||||||
using namespace CLHEP;
|
using namespace CLHEP;
|
||||||
|
|
||||||
inline namespace literals {
|
inline namespace literals {
|
||||||
constexpr double operator"" _m(long double v) { return static_cast<double>(v) * CLHEP::meter; }
|
constexpr double operator""_m(long double v) { return static_cast<double>(v) * CLHEP::meter; }
|
||||||
constexpr double operator"" _cm(long double v) { return static_cast<double>(v) * CLHEP::centimeter; }
|
constexpr double operator""_cm(long double v) { return static_cast<double>(v) * CLHEP::centimeter; }
|
||||||
constexpr double operator"" _mm(long double v) { return static_cast<double>(v) * CLHEP::millimeter; }
|
constexpr double operator""_mm(long double v) { return static_cast<double>(v) * CLHEP::millimeter; }
|
||||||
constexpr double operator"" _um(long double v) { return static_cast<double>(v) * CLHEP::micrometer; }
|
constexpr double operator""_um(long double v) { return static_cast<double>(v) * CLHEP::micrometer; }
|
||||||
constexpr double operator"" _nm(long double v) { return static_cast<double>(v) * CLHEP::nanometer; }
|
constexpr double operator""_nm(long double v) { return static_cast<double>(v) * CLHEP::nanometer; }
|
||||||
constexpr double operator"" _km(long double v) { return static_cast<double>(v) * CLHEP::kilometer; }
|
constexpr double operator""_km(long double v) { return static_cast<double>(v) * CLHEP::kilometer; }
|
||||||
|
|
||||||
constexpr double operator"" _m(unsigned long long v) { return static_cast<double>(v) * CLHEP::meter; }
|
constexpr double operator""_m(unsigned long long v) { return static_cast<double>(v) * CLHEP::meter; }
|
||||||
constexpr double operator"" _cm(unsigned long long v) { return static_cast<double>(v) * CLHEP::centimeter; }
|
constexpr double operator""_cm(unsigned long long v) { return static_cast<double>(v) * CLHEP::centimeter; }
|
||||||
constexpr double operator"" _mm(unsigned long long v) { return static_cast<double>(v) * CLHEP::millimeter; }
|
constexpr double operator""_mm(unsigned long long v) { return static_cast<double>(v) * CLHEP::millimeter; }
|
||||||
constexpr double operator"" _um(unsigned long long v) { return static_cast<double>(v) * CLHEP::micrometer; }
|
constexpr double operator""_um(unsigned long long v) { return static_cast<double>(v) * CLHEP::micrometer; }
|
||||||
constexpr double operator"" _nm(unsigned long long v) { return static_cast<double>(v) * CLHEP::nanometer; }
|
constexpr double operator""_nm(unsigned long long v) { return static_cast<double>(v) * CLHEP::nanometer; }
|
||||||
constexpr double operator"" _km(unsigned long long v) { return static_cast<double>(v) * CLHEP::kilometer; }
|
constexpr double operator""_km(unsigned long long v) { return static_cast<double>(v) * CLHEP::kilometer; }
|
||||||
|
|
||||||
constexpr double operator"" _deg(long double v) { return static_cast<double>(v) * CLHEP::degree; }
|
constexpr double operator""_deg(long double v) { return static_cast<double>(v) * CLHEP::degree; }
|
||||||
constexpr double operator"" _rad(long double v) { return static_cast<double>(v) * CLHEP::radian; }
|
constexpr double operator""_rad(long double v) { return static_cast<double>(v) * CLHEP::radian; }
|
||||||
constexpr double operator"" _deg(unsigned long long v) { return static_cast<double>(v) * CLHEP::degree; }
|
constexpr double operator""_deg(unsigned long long v) { return static_cast<double>(v) * CLHEP::degree; }
|
||||||
constexpr double operator"" _rad(unsigned long long v) { return static_cast<double>(v) * CLHEP::radian; }
|
constexpr double operator""_rad(unsigned long long v) { return static_cast<double>(v) * CLHEP::radian; }
|
||||||
|
|
||||||
constexpr double operator"" _ns(long double v) { return static_cast<double>(v) * CLHEP::nanosecond; }
|
constexpr double operator""_ns(long double v) { return static_cast<double>(v) * CLHEP::nanosecond; }
|
||||||
constexpr double operator"" _s(long double v) { return static_cast<double>(v) * CLHEP::second; }
|
constexpr double operator""_s(long double v) { return static_cast<double>(v) * CLHEP::second; }
|
||||||
constexpr double operator"" _ms(long double v) { return static_cast<double>(v) * CLHEP::millisecond; }
|
constexpr double operator""_ms(long double v) { return static_cast<double>(v) * CLHEP::millisecond; }
|
||||||
constexpr double operator"" _ns(unsigned long long v) { return static_cast<double>(v) * CLHEP::nanosecond; }
|
constexpr double operator""_ns(unsigned long long v) { return static_cast<double>(v) * CLHEP::nanosecond; }
|
||||||
constexpr double operator"" _s(unsigned long long v) { return static_cast<double>(v) * CLHEP::second; }
|
constexpr double operator""_s(unsigned long long v) { return static_cast<double>(v) * CLHEP::second; }
|
||||||
constexpr double operator"" _ms(unsigned long long v) { return static_cast<double>(v) * CLHEP::millisecond; }
|
constexpr double operator""_ms(unsigned long long v) { return static_cast<double>(v) * CLHEP::millisecond; }
|
||||||
|
|
||||||
constexpr double operator"" _MeV(long double v) { return static_cast<double>(v) * CLHEP::megaelectronvolt; }
|
constexpr double operator""_MeV(long double v) { return static_cast<double>(v) * CLHEP::megaelectronvolt; }
|
||||||
constexpr double operator"" _eV(long double v) { return static_cast<double>(v) * CLHEP::electronvolt; }
|
constexpr double operator""_eV(long double v) { return static_cast<double>(v) * CLHEP::electronvolt; }
|
||||||
constexpr double operator"" _keV(long double v) { return static_cast<double>(v) * CLHEP::kiloelectronvolt; }
|
constexpr double operator""_keV(long double v) { return static_cast<double>(v) * CLHEP::kiloelectronvolt; }
|
||||||
constexpr double operator"" _GeV(long double v) { return static_cast<double>(v) * CLHEP::gigaelectronvolt; }
|
constexpr double operator""_GeV(long double v) { return static_cast<double>(v) * CLHEP::gigaelectronvolt; }
|
||||||
constexpr double operator"" _TeV(long double v) { return static_cast<double>(v) * CLHEP::teraelectronvolt; }
|
constexpr double operator""_TeV(long double v) { return static_cast<double>(v) * CLHEP::teraelectronvolt; }
|
||||||
constexpr double operator"" _MeV(unsigned long long v) { return static_cast<double>(v) * CLHEP::megaelectronvolt; }
|
constexpr double operator""_MeV(unsigned long long v) { return static_cast<double>(v) * CLHEP::megaelectronvolt; }
|
||||||
constexpr double operator"" _eV(unsigned long long v) { return static_cast<double>(v) * CLHEP::electronvolt; }
|
constexpr double operator""_eV(unsigned long long v) { return static_cast<double>(v) * CLHEP::electronvolt; }
|
||||||
constexpr double operator"" _keV(unsigned long long v) { return static_cast<double>(v) * CLHEP::kiloelectronvolt; }
|
constexpr double operator""_keV(unsigned long long v) { return static_cast<double>(v) * CLHEP::kiloelectronvolt; }
|
||||||
constexpr double operator"" _GeV(unsigned long long v) { return static_cast<double>(v) * CLHEP::gigaelectronvolt; }
|
constexpr double operator""_GeV(unsigned long long v) { return static_cast<double>(v) * CLHEP::gigaelectronvolt; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ public:
|
|||||||
|
|
||||||
virtual class vtkPolyData *GetPolyData() const override;
|
virtual class vtkPolyData *GetPolyData() const override;
|
||||||
|
|
||||||
virtual void Update();
|
virtual void Update() override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void InstallPipe();
|
virtual void InstallPipe();
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ public:
|
|||||||
vtkContainerBox(Content *content);
|
vtkContainerBox(Content *content);
|
||||||
~vtkContainerBox();
|
~vtkContainerBox();
|
||||||
|
|
||||||
virtual class vtkPolyData *GetPolyData() const;
|
virtual class vtkPolyData *GetPolyData() const override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Updates the VTK representation from the internal state.
|
* @brief Updates the VTK representation from the internal state.
|
||||||
|
|||||||
@@ -129,10 +129,10 @@ uLibTypeMacro(Puppet, uLib::Object)
|
|||||||
|
|
||||||
vtkRendererCollection *GetRenderers() const;
|
vtkRendererCollection *GetRenderers() const;
|
||||||
|
|
||||||
const std::vector<uLib::PropertyBase *> &GetDisplayProperties() const {
|
const std::vector<uLib::PropertyBase *> &GetDisplayProperties() const override {
|
||||||
return m_DisplayProperties;
|
return m_DisplayProperties;
|
||||||
}
|
}
|
||||||
void RegisterDisplayProperty(uLib::PropertyBase *prop) {
|
void RegisterDisplayProperty(uLib::PropertyBase *prop) override {
|
||||||
m_DisplayProperties.push_back(prop);
|
m_DisplayProperties.push_back(prop);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user