*** empty log message ***

diff --git a/doc/yodl/versioninfo.yo b/doc/yodl/versioninfo.yo
index abb0db9146343949320556f151a88ff41faa57e5..8b87eca56137479ceed3aef8554a8d33d4737d2b 100644 (file)
--- a/doc/yodl/versioninfo.yo
+++ b/doc/yodl/versioninfo.yo
@@ -1,10 +1,10 @@
-COMMENT(-- $Id: versioninfo.yo,v 1.14 2004-05-08 17:18:21 pcg Exp $ --)
+COMMENT(-- $Id: versioninfo.yo,v 1.15 2004-05-30 19:12:42 root Exp $ --)
 DEFINEMACRO(RXVTNAME)(0)
        (rxvt)
 DEFINEMACRO(RXVTDATE)(0)
-       (2004-05-08)
+       (2004-05-10)
 DEFINEMACRO(RXVTVERSION)(0)
-       (2.9)
+       (3.0)
 DEFINEMACRO(RXVTMAINT)(0)
        (Marc A. Lehmann)
 DEFINEMACRO(RXVTMAINTEMAIL)(0)

diff --git a/src/iom.h b/src/iom.h
index 61065470e367b86d0630cf858f196d99e9a6dd36..ef7028f667ee6bfd688cde48f639b1ef04dc4330 100644 (file)
--- a/src/iom.h
+++ b/src/iom.h
@@ -72,10 +72,10 @@ struct io_manager_vec : vector<watcher *> {
 
   void erase_unordered (unsigned int pos)
   {
-    watcher *w = (*this)[size () - 1];
-    pop_back ();
+    watcher *w = (*this)[this->size () - 1];
+    this->pop_back ();
 
-    if (size ())
+    if (this->size ())
       if ((*this)[pos] = w)
         w->active = pos + 1;
   }

diff --git a/src/rxvtcolor.C b/src/rxvtcolor.C
index 596423c70dfe066be98a3a103278c040c5e4a23f..92bfa42b5be945ef6f0ae11ac61bf1e0a7c47b88 100644 (file)
--- a/src/rxvtcolor.C
+++ b/src/rxvtcolor.C
@@ -57,7 +57,7 @@ refcounted::~refcounted ()
 template<class T>
 T *refcache<T>::get (const char *id)
 {
-  for (T **i = begin (); i < end (); ++i)
+  for (T **i = this->begin (); i < this->end (); ++i)
     {
       if (!strcmp (id, (*i)->id))
         {
@@ -72,7 +72,7 @@ T *refcache<T>::get (const char *id)
 
   if (obj && obj->init ())
     {
-      push_back (obj);
+      this->push_back (obj);
       return obj;
     }
   else
@@ -90,7 +90,7 @@ void refcache<T>::put (T *obj)
 
   if (!--obj->referenced)
     {
-      erase (find (begin (), end (), obj));
+      this->erase (find (this->begin (), this->end (), obj));
       delete obj;
     }
 }
@@ -98,8 +98,8 @@ void refcache<T>::put (T *obj)
 template<class T>
 refcache<T>::~refcache ()
 {
-  while (size ())
-    put (*begin ());
+  while (this->size ())
+    put (*this->begin ());
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -309,7 +309,7 @@ Atom rxvt_display::atom (const char *name)
 
 /////////////////////////////////////////////////////////////////////////////
 
-template refcache<rxvt_display>;
+template class refcache<rxvt_display>;
 refcache<rxvt_display> displays;
 
 /////////////////////////////////////////////////////////////////////////////