Changeset 7300 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Apr 16, 2006, 7:30:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the most evil for (int i=0; i <'=' …) bug ever…

Location:

trunk/src/lib/util

Files:

• executor/executor.cc (modified) (1 diff)
• executor/executor.h (modified) (2 diffs)
• substring.h (modified) (1 diff)

trunk/src/lib/util/executor/executor.cc

@@ -53 +53 @@
 
   this->paramCount = 0;
-  for (unsigned int i = 0; i < FUNCTOR_MAX_ARGUMENTS; i++)
+  for (unsigned int i = 0; i <= FUNCTOR_MAX_ARGUMENTS; i++)
   {
-    if (this->defaultValue[i] == MT_NULL)
+    if (this->defaultValue[i] == MT_NULL || i == FUNCTOR_MAX_ARGUMENTS)
     {
       this->paramCount = i;

trunk/src/lib/util/executor/executor.h

@@ -121 +121 @@
 
 #define ExecutorFunctionPoiter5(t1, t2, t3, t4, t5) \
-  void EXECUTORINCLASS(*functionPointer_5_##t1##_##t2##_##t3##_##t4##_##t5)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE); \
+  void EXECUTORINCLASS(*functionPointer_5_##t1##_##t2##_##t3##_##t4##_##t5)(t1##_TYPE, t2##_TYPE, t3##_TYPE, t4##_TYPE, t5##_TYPE);
 
 
@@ -218 +218 @@
 
 
-
-//////////\//////////
+/////////////////////
 // DYNAMIC FUNCTOR //
-///////////\/////////
+/////////////////////
 #ifdef FUNCTOR_LIST
 #undef FUNCTOR_LIST

trunk/src/lib/util/substring.h

@@ -31 +31 @@
   unsigned int split(const std::string& string, const std::string& splitters, char escapeChar ='\\', char safemode_char = '"', char comment_char = '\0');
 
-
+  inline unsigned int getCount() { return this->strings.size(); };
+  const std::string& getString(unsigned int i) { return (i < this->strings.size()) ? this->strings[i] : emptyString; }; // safety-precaution
   const std::string& operator[](unsigned int i) { return this->getString(i); };
-
-  inline unsigned int getCount() { return this->strings.size(); };
-  const std::string& getString(unsigned int i) { return (i < this->strings.size()) ? this->strings[i] : emptyString; };
   unsigned int getOffset(unsigned int i);