fixing warnings #3

eclipse-sumo · Dec 19, 2024 · c1becfd · c1becfd
1 parent 893dcb1
commit c1becfd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/netedit/elements/network/GNEConnection.cpp b/src/netedit/elements/network/GNEConnection.cpp
@@ -37,11 +37,6 @@
 #include "GNEInternalLane.h"
 
 
-// ===========================================================================
-// static member definitions
-// ===========================================================================
-static const int NUM_POINTS = 5;
-
 // ===========================================================================
 // method definitions
 // ===========================================================================

diff --git a/src/netedit/frames/GNEAttributesEditorRow.cpp b/src/netedit/frames/GNEAttributesEditorRow.cpp
@@ -180,7 +180,7 @@ GNEAttributesEditorRow::showAttributeRow(const GNEAttributeProperties& attrPrope
     // show elements depending of attribute properties
     if (attrProperty.isActivatable()) {
         showAttributeToggleEnable(attrProperty, firstEditedAC->isAttributeEnabled(myAttribute), attributeEnabled);
-    } else if ((myAttribute == GNE_ATTR_PARENT)) {
+    } else if (myAttribute == GNE_ATTR_PARENT) {
         showAttributeReparent(attributeEnabled);
     } else if ((myAttribute == SUMO_ATTR_TYPE) && tagProperty.hasTypeParent()) {
         showAttributeInspectParent(attrProperty, attributeEnabled);

diff --git a/src/utils/router/AFCentralizedSPTree.h b/src/utils/router/AFCentralizedSPTree.h
@@ -147,19 +147,21 @@ class AFCentralizedSPTree {
         const SUMOVehicleClass vClass = vehicle == 0 ? SVC_IGNORING : vehicle->getVClass();
         std::vector<const E*> fromEdgesAsVector(fromEdges.begin(), fromEdges.end());
         init(fromEdgesAsVector, vehicle, msTime);
-        int num_visited = 0;
         size_t numberOfVisitedFromEdges = 0;
         bool minIsFromEdge = false;
 #ifdef CSPT_DEBUG_LEVEL_0
         size_t numberOfTouchedSupercellEdges = 0;
+        int num_visited = 0;
 #endif
 #ifdef _DEBUG
         const Cell* supercell = cell->getSupercell();
 #endif
         const bool mayRevisit = true;
 
         while (!myFrontierList.empty()) {
+#ifdef CSPT_DEBUG_LEVEL_0
             num_visited += 1;
+#endif
             // use the edge with the minimal length
             typename SUMOAbstractRouter<E, V>::EdgeInfo* minimumInfo = myFrontierList.front();
             const E* const minEdge = minimumInfo->edge;

diff --git a/src/utils/router/AFRouter.h b/src/utils/router/AFRouter.h
@@ -162,7 +162,7 @@ class AFRouter : public SUMOAbstractRouter<E, V> {
         myWeightPeriod(weightPeriod),
         myValidUntil(0),
         myBuilder(new AFBuilder<E, N, V, M>(myPartition->getNumberOfLevels(), edges, unbuildIsWarning,
-                                         flippedOperation, flippedLookup, havePermissions, haveRestrictions)),
+                                            flippedOperation, flippedLookup, havePermissions, haveRestrictions)),
         myType("arcFlagRouter"),
         myQueryVisits(0),
         myNumQueries(0),
@@ -209,7 +209,7 @@ class AFRouter : public SUMOAbstractRouter<E, V> {
         myWeightPeriod(weightPeriod),
         myValidUntil(0),
         myBuilder(new AFBuilder<E, N, V, M>(myPartition->getNumberOfLevels(), edges, unbuildIsWarning,
-                                         flippedOperation, flippedLookup, havePermissions, haveRestrictions)),
+                                            flippedOperation, flippedLookup, havePermissions, haveRestrictions)),
         myType("arcFlagRouter"),
         myQueryVisits(0),
         myNumQueries(0),
@@ -423,9 +423,11 @@ class AFRouter : public SUMOAbstractRouter<E, V> {
         this->myAmClean = false;
         // loop
         int num_visited = 0;
+#ifdef AFRO_DEBUG_LEVEL_1
         int numberOfFollowers = 0;
         int numberOfAvoidedFollowers = 0;
         int numberOfEmptyFlagVectors = 0;
+#endif
         const bool mayRevisit = myLookupTable != nullptr && !myLookupTable->consistent();
         const double speed = vehicle == nullptr ? myMaxSpeed : MIN2(vehicle->getMaxSpeed(), myMaxSpeed * vehicle->getChosenSpeedFactor());
 
@@ -469,10 +471,12 @@ class AFRouter : public SUMOAbstractRouter<E, V> {
                 if (followerInfo.prohibited || this->isProhibited(follower.first, vehicle)) {
                     continue;
                 }
+#ifdef AFRO_DEBUG_LEVEL_1
                 numberOfFollowers++;
                 if (followerFlagInfo->arcFlags.empty()) {
                     numberOfEmptyFlagVectors++;
                 }
+#endif
 #ifdef AFRO_DEBUG_LEVEL_2
                 myFlagContextStartTime = SysUtils::getCurrentMillis();
 #endif
@@ -482,7 +486,9 @@ class AFRouter : public SUMOAbstractRouter<E, V> {
                 myFlagContextTimeSum += (SysUtils::getCurrentMillis() - myFlagContextStartTime);
 #endif
                 if (!flag(followerFlagInfo, flagContext)) {
+#ifdef AFRO_DEBUG_LEVEL_1
                     numberOfAvoidedFollowers++;
+#endif
                     continue;
                 }