release: 0.1.8

[lilypond.git] / flower / include / pcursor.hh

diff --git a/flower/include/pcursor.hh b/flower/include/pcursor.hh
index 6c9ceff0d77207846dd9e28f3300f5953db085bd..5aa63d1d8f89cbf92d2dc383442f3c3d78d9ba60 100644 (file)
--- a/flower/include/pcursor.hh
+++ b/flower/include/pcursor.hh
@@ -34,38 +34,38 @@ public:
        return p;
     }
     T remove_prev_p() {
-       assert( ok() );
+       assert (ok());
        (*this)--;
        return remove_p();
     }
     
-    Link_list<T> &list() { return (Link_list<T>&)Cursor<void*>::list(); }
+    Link_list<T> &list() { return (Link_list<T>&)Cursor<void*>::list (); }
     PCursor<T> operator++(int) { return Cursor<void*>::operator++(0);}
     PCursor<T> operator--(int) { return Cursor<void*>::operator--(0); }
     PCursor<T> operator+=(int i) { return Cursor<void*>::operator+=(i);}
     PCursor<T> operator-=(int i) { return Cursor<void*>::operator-=(i); }    
     PCursor<T> operator -(int no) const { return Cursor<void*>::operator-(no);}
     int operator -(PCursor<T> op) const { return Cursor<void*>::operator-(op);}
-    PCursor<T> operator +( int no) const {return Cursor<void*>::operator+(no);}    PCursor(const Link_list<T> & l) : Cursor<void*> (l) {}
+    PCursor<T> operator +( int no) const {return Cursor<void*>::operator+(no);}    PCursor (const Link_list<T> & l) : Cursor<void*> (l) {}
     PCursor() : Cursor<void*> () {}
-    PCursor( const Cursor<void*>& cursor ) : Cursor<void*>(cursor) { }
+    PCursor (const Cursor<void*>& cursor) : Cursor<void*>(cursor) { }
     void* vptr() const { return *((Cursor<void*> &) *this); }
 
     // should return T& ?
-    T ptr() const { return (T) vptr(); }
+    T ptr() const { return (T) vptr (); }
     T operator ->() const { return  ptr(); }
     operator T() { return ptr(); }
     T operator *() { return ptr(); }
-    void add(T const & p ) { Cursor<void*>::add((void*) p); }
-    void insert(T const & p ) { Cursor<void*>::insert((void*) p);}    
-    static int compare(PCursor<T> a,PCursor<T>b) {
-       return Cursor<void*>::compare(a,b);
+    void add (T const & p) { Cursor<void*>::add ((void*) p); }
+    void insert (T const & p) { Cursor<void*>::insert ((void*) p);}    
+    static int compare (PCursor<T> a,PCursor<T>b) {
+       return Cursor<void*>::compare (a,b);
     }
 };
 
 
 
 #include "compare.hh"
-template_instantiate_compare(PCursor<T>, PCursor<T>::compare, template<class T>);
+TEMPLATE_INSTANTIATE_COMPARE(PCursor<T>, PCursor<T>::compare, template<class T>);
 
 #endif