fixing warnings #3

eclipse-sumo · Feb 6, 2024 · 12b10fa · 12b10fa
1 parent e1ee27e
commit 12b10fa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/foreign/PHEMlight/V5/cpp/CEP.h b/src/foreign/PHEMlight/V5/cpp/CEP.h
@@ -49,10 +49,7 @@ namespace PHEMlightdllV5 {
         bool privateHeavyVehicle;
         std::string privateFuelType;
         std::string privateCalcType;
-        eNormalizingType privateNormalizingType;
         double privateRatedPower;
-        double privateNormalizingPower;
-        double privateDrivingPower;
 
     public:
         CEP(VEHPHEMLightJSON::VEH* Vehicle, std::vector<std::string>& headerLineFCvalues, std::vector<std::vector<double> >& matrixFCvalues, std::vector<std::string>& headerLinePollutants, std::vector<std::vector<double> >& matrixPollutants, std::vector<double>& idlingFCvalues, std::vector<double>& idlingPollutants);

diff --git a/src/netbuild/NBOwnTLDef.cpp b/src/netbuild/NBOwnTLDef.cpp
@@ -840,6 +840,7 @@ NBOwnTLDef::computeLogicAndConts(int brakingTimeSeconds, bool onlyConts) {
                 updatedState = true;
             }
         }
+        UNUSED_PARAMETER(updatedState);  // disable warning
 #ifdef DEBUG_PHASES
         if (DEBUGCOND) {
             if (updatedState) {

diff --git a/src/netedit/elements/additional/GNEAdditionalHandler.cpp b/src/netedit/elements/additional/GNEAdditionalHandler.cpp
@@ -269,7 +269,7 @@ void
 GNEAdditionalHandler::buildChargingStation(const CommonXMLStructure::SumoBaseObject* sumoBaseObject, const std::string& id,
         const std::string& laneID, const double startPos, const double endPos, const std::string& name, const double chargingPower,
         const double efficiency, const bool chargeInTransit, const SUMOTime chargeDelay, const std::string& chargeType,
-        const SUMOTime waitingTime, const bool friendlyPosition, const std::string& parkingAreaID, const Parameterised::Map& parameters) {
+        const SUMOTime waitingTime, const bool friendlyPosition, const std::string& /* parkingAreaID */, const Parameterised::Map& parameters) {
     // check conditions
     if (!SUMOXMLDefinitions::isValidAdditionalID(id)) {
         writeInvalidID(SUMO_TAG_CHARGING_STATION, id);

diff --git a/src/utils/emissions/HelpersPHEMlight.cpp b/src/utils/emissions/HelpersPHEMlight.cpp
@@ -254,7 +254,7 @@ HelpersPHEMlight::getEmission(const PHEMCEP* oldCep, PHEMlightdll::CEP* currCep,
 
 
 double
-HelpersPHEMlight::getModifiedAccel(const SUMOEmissionClass c, const double v, const double a, const double slope) const {
+HelpersPHEMlight::getModifiedAccel(const SUMOEmissionClass c, const double v, const double a, const double slope, const EnergyParams* /* param */) const {
     PHEMlightdll::CEP* currCep = myCEPs.count(c) == 0 ? 0 : myCEPs.find(c)->second;
     if (currCep != nullptr) {
         return v == 0.0 ? 0.0 : MIN2(a, currCep->GetMaxAccel(v, slope));
@@ -291,7 +291,7 @@ HelpersPHEMlight::compute(const SUMOEmissionClass c, const PollutantsInterface::
 #endif
     PHEMlightdll::CEP* currCep = myCEPs.count(c) == 0 ? 0 : myCEPs.find(c)->second;
     if (currCep != nullptr) {
-        const double corrAcc = getModifiedAccel(c, corrSpeed, a, slope);
+        const double corrAcc = getModifiedAccel(c, corrSpeed, a, slope, param);
         if (currCep->getFuelType() != PHEMlightdll::Constants::strBEV &&
                 corrAcc < currCep->GetDecelCoast(corrSpeed, corrAcc, slope) &&
                 corrSpeed > PHEMlightdll::Constants::ZERO_SPEED_ACCURACY) {

diff --git a/src/utils/emissions/HelpersPHEMlight.h b/src/utils/emissions/HelpersPHEMlight.h
@@ -121,7 +121,7 @@ class HelpersPHEMlight : public PollutantsInterface::Helper {
      * @param[in] slope The road's slope at vehicle's position [deg]
      * @return the modified acceleration
      */
-    virtual double getModifiedAccel(const SUMOEmissionClass c, const double v, const double a, const double slope) const;
+    virtual double getModifiedAccel(const SUMOEmissionClass c, const double v, const double a, const double slope, const EnergyParams* param) const;
 
     /** @brief Returns the maximum deceleration value (as a negative number), which can still be considered as non-braking.
      * @param[in] c the emission class