trying merging cpu-mm with default branch

1 files changed, 35 insertions, 32 deletions

diff --git a/ue3/mycpu/cdat.h b/ue3/mycpu/cdat.h
index 3fda572..a533fae 100644
--- a/ue3/mycpu/cdat.h
+++ b/ue3/mycpu/cdat.h
@@ -1,12 +1,12 @@
 /**
  * @module cdat
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
- * @brief  Datatype template for mycpu
+ * @brief  Datatype template and datatype definition for CCPU and CMem
  * @date   10.05.2009
  */
 
-#ifndef CDATT_H
-#define CDATT_H
+#ifndef CDAT_H
+#define CDAT_H 1
 
 #include <boost/operators.hpp>
 #include <iostream>
@@ -14,7 +14,7 @@
 /**
  * @class CDatT
  *
- * Datatype template for mycpu.
+ * Datatype template for CCPU and CMem.
  */
 template <class T>
 class CDatT
@@ -72,7 +72,7 @@ class CDatT
     {}
 
     /**
-     * @method value
+     * @method getValue
      * @brief  returns value of CDatT
      * @param  -
      * @return value of CDatT
@@ -80,7 +80,21 @@ class CDatT
      * @exception  none
      * @conditions none
      */
-    T value() const
+    T getValue() const
+    {
+      return m_value;
+    }
+
+    /**
+     * @method operator T
+     * @brief  convert to T
+     * @param  -
+     * @return T
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    operator T()
     {
       return m_value;
     }
@@ -88,7 +102,7 @@ class CDatT
     /**
      * @method operator<
      * @brief  implementation of operator <
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return true if cdat is less than object x
      * @globalvars none
      * @exception  none
@@ -102,7 +116,7 @@ class CDatT
     /**
      * @method operator==
      * @brief  implementation of operator ==
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return true if cdat equals object x
      * @globalvars none
      * @exception  none
@@ -116,7 +130,7 @@ class CDatT
     /**
      * @method operator+=
      * @brief  implementation of operator +=
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return refecence to CDatT
      * @globalvars none
      * @exception  none
@@ -131,7 +145,7 @@ class CDatT
     /**
      * @method operator-=
      * @brief  implementation of operator -=
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return refecence to CDatT
      * @globalvars none
      * @exception  none
@@ -146,7 +160,7 @@ class CDatT
     /**
      * @method operator*=
      * @brief  implementation of operator *=
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return refecence to CDatT
      * @globalvars none
      * @exception  none
@@ -161,7 +175,7 @@ class CDatT
     /**
      * @method operator/=
      * @brief  implementation of operator /=
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return refecence to CDatT
      * @globalvars none
      * @exception  none
@@ -176,7 +190,7 @@ class CDatT
     /**
      * @method operator%=
      * @brief  implementation of operator %=
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return refecence to CDatT
      * @globalvars none
      * @exception  none
@@ -191,7 +205,7 @@ class CDatT
     /**
      * @method operator|=
      * @brief  implementation of operator |=
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return refecence to CDatT
      * @globalvars none
      * @exception  none
@@ -206,7 +220,7 @@ class CDatT
     /**
      * @method operator&=
      * @brief  implementation of operator &=
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return refecence to CDatT
      * @globalvars none
      * @exception  none
@@ -221,7 +235,7 @@ class CDatT
     /**
      * @method operator^=
      * @brief  implementation of operator ^=
-     * @param  reference to CDatT
+     * @param  x  reference to CDatT
      * @return refecence to CDatT
      * @globalvars none
      * @exception  none
@@ -295,27 +309,16 @@ class CDatT
       return stream;
     }
 
-      /**
-     * @method getTypeValue
-     * @brief  returns value as type T
-     * @param  -
-     * @return m_value
-     * @globalvars none
-     * @exception  none
-     * @conditions none
-     */
-    T& getTypeValue()
-    {
-      return m_value;
-    }
-
   private:
     /* members */
     T m_value;
 };
 
-
-/** define CDat */
+/**
+ * @class CDat
+ *
+ * Datatype for CCPU and CMem
+ */
 typedef CDatT<int> CDat;
 
 #endif