Changeset 11811

Timestamp:

Feb 24, 2018, 6:09:45 PM (6 years ago)

Author:

landauf

Message:

fixed some warnings with gcc 7

Location:

code/branches/cegui0.8_ogre1.9/src

Files:

• libraries/network/TrafficControl.cc (modified) (1 diff)
• orxonox/controllers/AIController.cc (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (modified) (2 diffs)

code/branches/cegui0.8_ogre1.9/src/libraries/network/TrafficControl.cc

@@ -140 +140 @@
     if ( !this->bActive_ )
       return;
-      std::list<obj>::iterator itvec;  // iterator to iterate through the acked objects
+    std::list<obj>::iterator itvec;  // iterator to iterate through the acked objects
 
     //assertions to make sure the maps already exist

code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/AIController.cc

@@ -227 +227 @@
                     this->moveToTargetPosition();
 
-                    this->doFire();
+                this->doFire();
             }
         }

code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc

@@ -72 +72 @@
 {
     const int LINES = 30;
-    const float CHAR_WIDTH = 8.0f; // fix this please - determine the char-width dynamically
+    const float HARDCODED_CHAR_WIDTH = 8.0f; // fix this please - determine the char-width dynamically
 
     SetConsoleCommand("InGameConsole", "openConsole", &InGameConsole::openConsole);
@@ -448 +448 @@
 
         if (LINES > 0)
-            this->maxCharsPerLine_ = std::max(10U, static_cast<unsigned int>(static_cast<float>(this->desiredTextWidth_) / CHAR_WIDTH));
+            this->maxCharsPerLine_ = std::max(10U, static_cast<unsigned int>(static_cast<float>(this->desiredTextWidth_) / HARDCODED_CHAR_WIDTH));
         else
             this->maxCharsPerLine_ = 10;