Index: common/vector.hpp
===================================================================
RCS file: /cvsroot/aspell/aspell/common/vector.hpp,v
retrieving revision 1.4
diff -u -r1.4 vector.hpp
--- common/vector.hpp	4 Aug 2002 05:20:31 -0000	1.4
+++ common/vector.hpp	13 Jan 2003 11:16:51 -0000
@@ -16,20 +16,20 @@
   {
   public:
     void append(T t) {
-      push_back(t);
+      this->push_back(t);
     }
     void append(const T * begin, unsigned int size) {
-      insert(end(), begin, begin+size);
+      insert(this->end(), begin, begin+size);
     }
     T * data() {
-      return &front();
+      return &this->front();
     }
 
     T * pbegin() {
-      return &*begin();
+      return &*this->begin();
     }
     T * pend() {
-      return &*end();
+      return &*this->end();
     }
   };
 }
Index: modules/speller/default/data.cpp
===================================================================
RCS file: /cvsroot/aspell/aspell/modules/speller/default/data.cpp,v
retrieving revision 1.4
diff -u -r1.4 data.cpp
--- modules/speller/default/data.cpp	15 Aug 2002 23:12:51 -0000	1.4
+++ modules/speller/default/data.cpp	13 Jan 2003 11:17:01 -0000
@@ -107,13 +107,13 @@
 
   void DataSet::FileName::clear()
   {
-    const_cast<String &      >(path) = "";
-    const_cast<const char * &>(name) = path.c_str();
+    path  = "";
+    name = path.c_str();
   }
 
   void DataSet::FileName::set(ParmString str) 
   {
-    const_cast<String &>(path) = str;
+    path = str;
     int s = path.size();
     int i = s;
     while (i >= 0) {
@@ -123,7 +123,7 @@
       }
       --i;
     }
-    const_cast<const char * &>(name) = path.c_str() + i;
+    name = path.c_str() + i;
   }
 
   //
Index: modules/speller/default/data.hpp
===================================================================
RCS file: /cvsroot/aspell/aspell/modules/speller/default/data.hpp,v
retrieving revision 1.2
diff -u -r1.2 data.hpp
--- modules/speller/default/data.hpp	15 Aug 2002 23:12:51 -0000	1.2
+++ modules/speller/default/data.hpp	13 Jan 2003 11:17:02 -0000
@@ -40,8 +40,8 @@
     class FileName {
       void copy(const FileName & other);
     public:
-      const String       path;
-      const char * const name;
+      String       path;
+      const char * name;
       
       void clear();
       void set(ParmString);