Changeset 1879

Timestamp:

Oct 3, 2008, 2:44:46 PM (16 years ago)

Author:

rgrieder

Message:

Removed some always-true statements that gcc issued with the -W option.
There is still a lot of warnings from the Ogre UTFString header about the copy constructor initialisation.
—> We would need to use -W -Wno-unused-parameter -Wno-?. I couldn't find that option directly unfortunately.

Location:

code/trunk/src

Files:

• core/CommandEvaluation.cc (modified) (2 diffs)
• core/Executor.cc (modified) (3 diffs)
• core/Executor.h (modified) (2 diffs)
• core/Functor.h (modified) (1 diff)
• orxonox/overlays/console/InGameConsole.cc (modified) (1 diff)
• orxonox/overlays/console/InGameConsole.h (modified) (1 diff)

code/trunk/src/core/CommandEvaluation.cc

@@ -220 +220 @@
     void CommandEvaluation::setEvaluatedParameter(unsigned int index, MultiType param)
     {
-        if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
+        if (index < MAX_FUNCTOR_ARGUMENTS)
             this->param_[index] = param;
     }
@@ -226 +226 @@
     MultiType CommandEvaluation::getEvaluatedParameter(unsigned int index) const
     {
-        if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
+        if (index < MAX_FUNCTOR_ARGUMENTS)
             return this->param_[index];
 

code/trunk/src/core/Executor.cc

@@ -132 +132 @@
     Executor& Executor::setDescriptionParam(unsigned int param, const std::string& description)
     {
-        if (param >= 0 && param < MAX_FUNCTOR_ARGUMENTS)
+        if (param < MAX_FUNCTOR_ARGUMENTS)
         {
             if (!this->bAddedDescriptionParam_[param])
@@ -150 +150 @@
     const std::string& Executor::getDescriptionParam(unsigned int param) const
     {
-        if (param >= 0 && param < MAX_FUNCTOR_ARGUMENTS)
+        if (param < MAX_FUNCTOR_ARGUMENTS)
             return GetLocalisation(this->descriptionParam_[param]);
 
@@ -234 +234 @@
     Executor& Executor::setDefaultValue(unsigned int index, const MultiType& param)
     {
-        if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
+        if (index < MAX_FUNCTOR_ARGUMENTS)
         {
             this->defaultValue_[index] = param;

code/trunk/src/core/Executor.h

@@ -198 +198 @@
             inline MultiType getDefaultValue(unsigned int index) const
             {
-                if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
+                if (index < MAX_FUNCTOR_ARGUMENTS)
                     return this->defaultValue_[index];
 
@@ -207 +207 @@
             inline bool defaultValueSet(unsigned int index) const
             {
-                if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
+                if (index < MAX_FUNCTOR_ARGUMENTS)
                     return this->bAddedDefaultValue_[index];
 

code/trunk/src/core/Functor.h

@@ -105 +105 @@
             inline MultiType getReturnvalue() const { return this->returnedValue_; }
 
-            std::string getTypenameParam(unsigned int param) const { return (param >= 0 && param < 5) ? this->typeParam_[param] : ""; }
+            std::string getTypenameParam(unsigned int param) const { return (param < 5) ? this->typeParam_[param] : ""; }
             std::string getTypenameReturnvalue() const { return this->typeReturnvalue_; }
 

code/trunk/src/orxonox/overlays/console/InGameConsole.cc

@@ -328 +328 @@
         if (pos > maxCharsPerLine_)
             pos = maxCharsPerLine_;
-        else if (pos < 0)
-            pos = 0;
 
         this->consoleOverlayCursor_->setCaption(std::string(pos,' ') + cursorSymbol_);

code/trunk/src/orxonox/overlays/console/InGameConsole.h

@@ -62 +62 @@
 
     private: // functions
-        InGameConsole(const InGameConsole& other) {}
+        InGameConsole(const InGameConsole& other);
 
         void activate();