Changeset 1031 for code/branches/core2/src

Timestamp:

Apr 12, 2008, 3:56:36 PM (17 years ago)

Author:

landauf

Message:

corrected debug output in case of an invalid vector index
(remember: don't use COUT(x) inside an if/else block without using braces - it's a macro using 'if' itself)

Location:

code/branches/core2/src/orxonox/core

Files:

• ConfigValueContainer.cc (modified) (2 diffs)
• ConfigValueIncludes.h (modified) (1 diff)
• Language.cc (modified) (2 diffs)

code/branches/core2/src/orxonox/core/ConfigValueContainer.cc

@@ -153 +153 @@
             {
                 if (!success)
+                {
                     COUT(1) << "Error: Config-value '" << this->varname_ << "' in " << this->sectionname_ << " is a vector." << std::endl;
+                }
                 else
+                {
                     COUT(1) << "Error: Invalid vector-index." << std::endl;
+                }
                 return false;
             }
@@ -275 +279 @@
 
             if (!success || index < 0 || index > MAX_VECTOR_INDEX)
+            {
+                if (!success)
+                {
+                    COUT(1) << "Error: Config-value '" << this->varname_ << "' in " << this->sectionname_ << " is a vector." << std::endl;
+                }
+                else
+                {
+                    COUT(1) << "Error: Invalid vector-index." << std::endl;
+                }
                 return false;
+            }
 
             if (token.size() >= 2)

code/branches/core2/src/orxonox/core/ConfigValueIncludes.h

@@ -82 +82 @@
     } \
     else \
-        COUT(2) << "Warning: Couldn't reset variable " << #varname << ", corresponding container doesn't exist." << std::endl
+    { \
+        COUT(2) << "Warning: Couldn't reset variable " << #varname << ", corresponding container doesn't exist." << std::endl; \
+    }
 
 /**

code/branches/core2/src/orxonox/core/Language.cc

@@ -253 +253 @@
                     this->createEntry(lineString.substr(0, pos), lineString.substr(pos + 1));
                 else
+                {
                     COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(this->defaultLanguage_) << std::endl;
+                }
             }
         }
@@ -305 +307 @@
                 }
                 else
+                {
                     COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(this->language_) << std::endl;
+                }
             }
         }