1 files changed, 43 insertions, 13 deletions

diff --git a/ue4/mycpu/cdatset.h b/ue4/mycpu/cdatset.h
index 03e71f4..56a0630 100644
--- a/ue4/mycpu/cdatset.h
+++ b/ue4/mycpu/cdatset.h
@@ -1,5 +1,5 @@
 /**
- * @module cdat
+ * @module cdatset
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
  * @brief  Datatype template and datatype definition for CCPU and CMem
  * @date   26.05.2009
@@ -8,20 +8,46 @@
 #ifndef CDATSET_H
 #define CDATSET_H 1
 
-#include <boost/operators.hpp>
 #include <iostream>
+#include "cdat.h"
 
 /**
- * @class CDat
+ * @class CDatSet
  *
  * Datatype template for CCPU and CMem.
  */
-template <class T>
 class CDatSet
-  : public CDat<T> 
+  : public CDat<int>, public boost::operators<CDatSet>
 {
   public:
     /**
+     * @method CDatSet
+     * @brief  Default ctor
+     * @param  -
+     * @return -
+     * @globalvars none
+     * @exception  bad_alloc
+     * @pre  none
+     * @post none
+     */
+    CDatSet()
+    {}
+
+    /**
+     * @method CDatSet
+     * @brief  Copy constructor for int
+     * @param  newval  new value for CDatSet
+     * @return -
+     * @globalvars none
+     * @exception  none
+     * @pre  none
+     * @post none
+     */
+    CDatSet(const int newval)
+      : CDat<int>(newval)
+    {}
+
+    /**
      * @method operator>>
      * @brief  Shift/read operator for inputstream
      * @param  stream  reference to inputstream
@@ -29,19 +55,23 @@ class CDatSet
      * @return reference to inputstream
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     friend std::istream& operator>>(std::istream & stream, CDatSet& cdat)
     {
-      std::string s;
-      stream >> s;
-      cdat.m_value = s.size();
+      unsigned count = 0;
+      while(stream.good() && !stream.eof())
+      {
+        int val = stream.get();
+        if (val != 'o')
+          break;
+        ++count;
+      }
+      stream.clear();
+      cdat.m_value = count;
       return stream;
     }
-
-  private:
-    /* members */
-    T m_value;
 };
 
 #endif