X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_handle.h;h=7eb711077ad633518cd5e68795702a4974e4c5f3;hb=7da2edef94e87ba8ba1223198be96942b5829aaf;hp=3889d6bb18fde658e70b21969d9e45b757ceb32e;hpb=36d01e1527fda602a9aed07d209eb34e6770bca8;p=synfig.git diff --git a/ETL/trunk/ETL/_handle.h b/ETL/trunk/ETL/_handle.h index 3889d6b..7eb7110 100644 --- a/ETL/trunk/ETL/_handle.h +++ b/ETL/trunk/ETL/_handle.h @@ -386,12 +386,12 @@ private: void add_to_rlist() { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing assert(obj); obj->rref(); - // If this is the first reversable handle + // If this is the first reversible handle if(!obj->front_) { obj->front_=obj->back_=this; @@ -407,11 +407,11 @@ private: void del_from_rlist() { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing assert(obj); obj->runref(); - // If this is the last reversable handle + // If this is the last reversible handle if(obj->front_==obj->back_) { obj->front_=obj->back_=0; @@ -438,20 +438,20 @@ public: //! Constructor that constructs from a pointer to new object rhandle(pointer x):handle(x) { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing if(obj)add_to_rlist(); } rhandle(const handle &x):handle(x) { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing if(obj)add_to_rlist(); } //! Default copy constructor rhandle(const rhandle &x):handle(x) { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing if(obj)add_to_rlist(); } @@ -485,7 +485,7 @@ public: rhandle & operator=(const rhandle &x) { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing if(x.get()==obj) return *this; @@ -503,7 +503,7 @@ public: rhandle& operator=(const handle &x) { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing if(x.get()==obj) return *this; @@ -521,7 +521,7 @@ public: rhandle& operator=(value_type* x) { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing if(x==obj) return *this; @@ -541,7 +541,7 @@ public: void detach() { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing if(obj)del_from_rlist(); handle::detach(); obj=0; @@ -556,11 +556,11 @@ public: /*! Uses the default constructor */ void spawn() { operator=(handle(new T())); } - //! Returns number of reversable instances + //! Returns number of reversible instances count_type rcount()const { -// value_type*const& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*const& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing return obj?obj->rcount():0; } @@ -568,14 +568,14 @@ public: bool runique()const { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing assert(obj); return obj->front_==obj->back_; } //! \writeme int replace(const handle &x) { -// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 form barfing +// value_type*& obj(handle::obj); // Required to keep gcc 3.4.2 from barfing assert(obj); assert(x.get()!=obj);