Changeset 933 for code/branches/core2/src/util

Timestamp:

Mar 27, 2008, 5:04:41 PM (17 years ago)

Author:

landauf

Message:

XMLPort uses now executors and has default-values.

Location:

code/branches/core2/src/util

Files:

• Math.h (modified) (2 diffs)
• MultiTypeMath.cc (modified) (1 diff)
• MultiTypeMath.h (modified) (1 diff)
• MultiTypePrimitive.cc (modified) (1 diff)
• MultiTypePrimitive.h (modified) (1 diff)
• MultiTypeString.cc (modified) (1 diff)
• MultiTypeString.h (modified) (1 diff)
• String.h (modified) (2 diffs)

code/branches/core2/src/util/Math.h

@@ -26 +26 @@
  */
 
-#ifndef _Math_H__
-#define _Math_H__
+#ifndef _Util_Math_H__
+#define _Util_Math_H__
 
 #include <ostream>
@@ -146 +146 @@
 }
 
-#endif /* _Math_H__ */
+#endif /* _Util_Math_H__ */

code/branches/core2/src/util/MultiTypeMath.cc

@@ -88 +88 @@
 }
 
-MultiTypeMath::operator orxonox::BaseObject*() const
-{ return (this->type_ == MT_void) ? (orxonox::BaseObject*)this->value_.void_ : (orxonox::BaseObject*)ConvertValueAndReturn<MultiTypeMath, void*>(*this); }
 MultiTypeMath::operator void*() const
 { return (this->type_ == MT_void) ? this->value_.void_ : ConvertValueAndReturn<MultiTypeMath, void*>(*this); }

code/branches/core2/src/util/MultiTypeMath.h

@@ -91 +91 @@
         bool operator!=(const MultiTypeMath& mtm) const;
 
-        virtual operator orxonox::BaseObject*()          const;
         virtual operator void*()                const;
         virtual operator int()                  const;

code/branches/core2/src/util/MultiTypePrimitive.cc

@@ -134 +134 @@
 }
 
-MultiTypePrimitive::operator orxonox::BaseObject*() const
-{ return (this->type_ == MT_void) ? (orxonox::BaseObject*)this->value_.void_ : (orxonox::BaseObject*)ConvertValueAndReturn<MultiTypePrimitive, void*>(*this); }
 MultiTypePrimitive::operator void*() const
 { return (this->type_ == MT_void) ? this->value_.void_ : ConvertValueAndReturn<MultiTypePrimitive, void*>(*this); }

code/branches/core2/src/util/MultiTypePrimitive.h

@@ -105 +105 @@
         bool operator!=(const MultiTypePrimitive& mtp) const;
 
-        virtual operator orxonox::BaseObject*()    const;
+        template <class T>
+        operator T*()                     const
+        { return ((T*)this->value_.void_); }
         virtual operator void*()          const;
         virtual operator int()            const;

code/branches/core2/src/util/MultiTypeString.cc

@@ -65 +65 @@
 }
 
-MultiTypeString::operator orxonox::BaseObject*() const
-{ return (this->type_ == MT_void) ? (orxonox::BaseObject*)this->value_.void_ : (orxonox::BaseObject*)ConvertValueAndReturn<MultiTypeString, void*>(*this); }
 MultiTypeString::operator void*() const
 { return (this->type_ == MT_void) ? this->value_.void_ : ConvertValueAndReturn<MultiTypeString, void*>(*this); }

code/branches/core2/src/util/MultiTypeString.h

@@ -79 +79 @@
         bool operator!=(const MultiTypeString& mts) const;
 
-        virtual operator orxonox::BaseObject*() const;
         virtual operator void*()                const;
         virtual operator int()                  const;

code/branches/core2/src/util/String.h

@@ -26 +26 @@
  */
 
-#ifndef _String_H__
-#define _String_H__
+#ifndef _Util_String_H__
+#define _Util_String_H__
 
 #include <string>
@@ -144 +144 @@
 };
 
-#endif /* _String_H__ */
+#endif /* _Util_String_H__ */