diff --git a/src/blackgui/components/remoteaircraftselector.cpp b/src/blackgui/components/remoteaircraftselector.cpp index 36201e6b0..91ff70c20 100644 --- a/src/blackgui/components/remoteaircraftselector.cpp +++ b/src/blackgui/components/remoteaircraftselector.cpp @@ -33,7 +33,7 @@ namespace BlackGui BlackMisc::Aviation::CCallsign CRemoteAircraftSelector::getSelectedCallsign() const { - const CCallsign empty; + const CCallsign empty {}; int index = ui->cb_RemoteAircraftSelector->currentIndex(); if (index < 0 || index > this->m_aircraft.size()) { return empty; } return m_aircraft[index].getCallsign(); diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h index bef928438..f4c233359 100644 --- a/src/blackmisc/aviation/aircraftengine.h +++ b/src/blackmisc/aviation/aircraftengine.h @@ -24,7 +24,7 @@ namespace BlackMisc public: //! Default constructor - CAircraftEngine() = default; + CAircraftEngine() {} //! Constructor CAircraftEngine(int number, bool on); diff --git a/src/blackmisc/aviation/aircraftenginelist.cpp b/src/blackmisc/aviation/aircraftenginelist.cpp index 43087fcca..735d7e375 100644 --- a/src/blackmisc/aviation/aircraftenginelist.cpp +++ b/src/blackmisc/aviation/aircraftenginelist.cpp @@ -30,23 +30,7 @@ namespace BlackMisc CAircraftEngine CAircraftEngineList::getEngine(int engineNumber) const { Q_ASSERT(engineNumber >= 0); - - // The following commented line results in a gcc compiler segfault: - // - // internal compiler error: in size_binop_loc, at fold-const.c:1450 - // } // namespace - // ^ - // - // frontOrDefault() is defined as: - // static const value_type def; return empty() ? def : front(); - // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - // Workaround it by using non static const value instead. - - //return this->findBy(&CAircraftEngine::getNumber, engineNumber).frontOrDefault(); - - const CAircraftEngine def; - auto results = this->findBy(&CAircraftEngine::getNumber, engineNumber); - return results.empty() ? def : front(); + return this->findBy(&CAircraftEngine::getNumber, engineNumber).frontOrDefault(); } bool CAircraftEngineList::isEngineOn(int engineNumber) const diff --git a/src/blackmisc/sequence.h b/src/blackmisc/sequence.h index 75532f737..26f52d1df 100644 --- a/src/blackmisc/sequence.h +++ b/src/blackmisc/sequence.h @@ -165,7 +165,7 @@ namespace BlackMisc /*! * \brief Access the first element, or a default-initialized value if the sequence is empty. */ - const_reference frontOrDefault() const { static const value_type def; return empty() ? def : front(); } + const_reference frontOrDefault() const { static const value_type def {}; return empty() ? def : front(); } /*! * \brief Access the first element, or a default-initialized value if the sequence is empty.