1 files changed, 44 insertions, 21 deletions

diff --git a/ue4/mycpu/cmem.h b/ue4/mycpu/cmem.h
index c6b8735..3f35a70 100644
--- a/ue4/mycpu/cmem.h
+++ b/ue4/mycpu/cmem.h
@@ -12,21 +12,43 @@
 #include <istream>
 #include <sstream>
 #include <stdexcept>
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
 #ifdef DEBUG
 # include <iostream>
 # include <iomanip>
 #endif
 
 /**
+ * @class CMemError
+ *
+ * Exception thrown by implemententations of CMem
+ */
+class CMemError
+ : public std::invalid_argument
+{
+  public:
+    /**
+     * @method CMemError
+     * @brief  Default exception ctor
+     * @param  what  message to pass along
+     * @return -
+     * @globalvars none
+     * @exception  none
+     * @pre  none
+     * @post none
+     */
+    CMemError(const std::string& what)
+      : std::invalid_argument(what)
+    {}
+};
+
+/**
  * @class CMem
  *
  * Extends std::vector template for use as memory for CCPU.
  */
-template<class T=CDat<int>, int width=0>
+template <class T>
 class CMem
- : public std::vector<T>
+  : public std::vector<T>
 {
   typedef std::vector<T> super;
   typedef typename super::iterator iterator;
@@ -39,13 +61,15 @@ class CMem
      * @method initialize
      * @brief  initialize the vector with the content of istream. istream is
      *         read per line. empty lines will add unitialized elements.
-     * @param  in  inputstream to read from
+     * @param  in        inputstream to read from
+     * @param  datatype  reference instance of datatype to copy from
      * @return void
      * @globalvars none
-     * @exception  std::runtime_error
-     * @conditions none
+     * @exception  CMemError
+     * @pre  none
+     * @post none
      */
-    void initialize(std::istream& in)
+    void initialize(std::istream& in, T& datatype)
     {
       if (!in.good())
         return;
@@ -56,24 +80,22 @@ class CMem
       {
         ++i;
         std::getline(in, line);
-        boost::algorithm::trim(line);
-        
+
         /* skip last line if it's empty */
         if (line.empty() && in.eof())
           break;
 
-        T value;
-        try
-        {
+        T value(datatype);
         if (!line.empty())
         {
-          value = boost::lexical_cast<T>(line);
-        }
-        catch(boost::bad_lexical_cast& ex)
-        {
-          std::stringstream sstr;
-          sstr << "Unable to convert input (line " << i << "): " << ex.what();
-          throw std::runtime_error(sstr.str());
+          /* simple boost::lexical_cast replacement */
+          std::stringstream interpreter;
+          if(!(interpreter << line && interpreter >> value && interpreter.get() == std::char_traits<char>::eof()))
+          {
+            std::stringstream sstr;
+            sstr << "Unable to convert input (line " << i << ") to datatype";
+            throw CMemError(sstr.str());
+          }
         }
 
         push_back(value);
@@ -88,7 +110,8 @@ class CMem
      * @return void
      * @globalvars none
      * @exception  none
-     * @conditions none
+     * @pre  none
+     * @post none
      */
     void dump(std::ostream& out)
     {