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

Timestamp:

Nov 19, 2005, 12:16:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: valgrind sweep

Location:

trunk/src/lib/util

Files:

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

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

@@ -44 +44 @@
     /** @returns the Type of this Function (either static or objective) */
     inline Executor_Type getType() const { return this->functorType; };
+    /** @returns the Count of Parameters this Executor takes */
+    inline unsigned int getParamCount() const { return this->paramCount; };
 
     static void debug();
@@ -54 +56 @@
 
   protected:
-    Executor_Type                    functorType;                          //!< The type of Function we've got (either static or objective).
-    unsigned int                     paramCount;                           //!< the count of parameters.
-    MultiType*                       defaultValue;                         //!< Default Values.
+    Executor_Type                    functorType;      //!< The type of Function we've got (either static or objective).
+    unsigned int                     paramCount;       //!< the count of parameters.
+    MultiType*                       defaultValue;     //!< Default Values.
 };
 

trunk/src/lib/util/multi_type.cc

@@ -96 +96 @@
  * @returns a Copy of itself. (strings inside are copied as well)
  */
-MultiType MultiType::operator= (const MultiType& mt)
-{
-  this->type = mt.type;
-  this->value = mt.value;
-
-  if (mt.type == MT_STRING && mt.storedString != NULL)
-  {
-    this->storedString = new char[strlen (mt.storedString)+1];
-    strcpy(this->storedString, mt.storedString);
-    this->value.String = this->storedString;
-  }
-  else
-    this->storedString = NULL;
-}
+// MultiType MultiType::operator= (const MultiType& mt)
+// {
+//   this->type = mt.type;
+//   this->value = mt.value;
+//
+//   if (mt.type == MT_STRING && mt.storedString != NULL)
+//   {
+//     this->storedString = new char[strlen (mt.storedString)+1];
+//     strcpy(this->storedString, mt.storedString);
+//     this->value.String = this->storedString;
+//   }
+//   else
+//     this->storedString = NULL;
+//   return *this;
+// }
 
 /**
@@ -126 +127 @@
   this->type = (MT_Type)type;
 
+  if (this->type != type)
+  {
+    if (this->type == MT_NULL)
+      this->setString("");
+
+  }
   /// @todo check if this works...
 
@@ -158 +165 @@
   this->type = MT_FLOAT;
   this->value.Float = value;
-
 }
 
@@ -308 +314 @@
     {
       sprintf(tmpString, "%d", this->value.Int);
-      this->storedString = new char[strlen (tmpString)+1];
+      this->storedString = new char[strlen(tmpString)+1];
       strcpy (this->storedString, tmpString);
       return this->storedString;

trunk/src/lib/util/multi_type.h

@@ -42 +42 @@
     virtual ~MultiType();
 
-    MultiType operator= (const MultiType& mt);
+//    MultiType operator= (const MultiType& mt);
 
     void setType(int type);