--- rxvt-unicode/src/rxvtstl.h 2004/02/09 07:11:49 1.3 +++ rxvt-unicode/src/rxvtstl.h 2004/02/13 12:16:21 1.4 @@ -21,13 +21,13 @@ void erase (iterator i) { simplevec::erase ((void **)i); } iterator begin () const { return (iterator)simplevec::begin (); } iterator end () const { return (iterator)simplevec::end (); } - T &operator [](int i) { return *(T *)(&((*(simplevec *)this)[i])); } - const T &operator [](int i) const { return *(const T *)(&((*(const simplevec *)this)[i])); } + T &operator [] (int i) { return * (T *) (& ((* (simplevec *)this)[i])); } + const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec *)this)[i])); } }; #endif template -I find(I first, I last, const T& value) +I find (I first, I last, const T& value) { while (first != last && *first != value) ++first; @@ -39,51 +39,51 @@ struct auto_ptr { T *p; - auto_ptr() : p(0) { } - auto_ptr(T *a) : p(a) { } + auto_ptr () : p (0) { } + auto_ptr (T *a) : p (a) { } - auto_ptr(auto_ptr &a) + auto_ptr (auto_ptr &a) { p = a.p; a.p = 0; } template - auto_ptr(auto_ptr &a) + auto_ptr (auto_ptr &a) { p = a.p; a.p = 0; } - ~auto_ptr() + ~auto_ptr () { delete p; } // void because it makes sense in our context - void operator =(T *a) + void operator = (T *a) { delete p; p = a; } - void operator =(auto_ptr &a) + void operator = (auto_ptr &a) { *this = a.p; a.p = 0; } template - void operator =(auto_ptr &a) + void operator = (auto_ptr &a) { *this = a.p; a.p = 0; } - operator T *() const { return p; } + operator T * () const { return p; } - T *operator ->() const { return p; } - T &operator *() const { return *p; } + T *operator -> () const { return p; } + T &operator * () const { return *p; } T *get () { @@ -99,7 +99,7 @@ { ~stringvec () { - for (char **c = begin(); c != end(); c++) + for (char **c = begin (); c != end (); c++) delete [] *c; } };