1.1 --- a/branchobj.cpp	Thu Aug 31 12:51:20 2006 +0000
     1.2 +++ b/branchobj.cpp	Tue Sep 05 07:56:57 2006 +0000
     1.3 @@ -150,7 +150,7 @@
     1.4  int BranchObj::getNum()
     1.5  {
     1.6  	if (parObj)
     1.7 -		return ((BranchObj*)(parObj))->getNum ((BranchObj*)(this));
     1.8 +		return ((BranchObj*)parObj)->getNum (this);
     1.9  	else
    1.10  		return 0;
    1.11  }
    1.12 @@ -159,9 +159,10 @@
    1.13  {
    1.14  	// keep current pointer in branch, 
    1.15  	// otherwise save might fail
    1.16 -	int cur=branch.at();
    1.17 +	// FIXME is this _really_ still true?
    1.18 +//	int cur=branch.at();
    1.19  	int ind=branch.findRef (bo);
    1.20 -	branch.at(cur);
    1.21 +//	branch.at(cur);
    1.22  	return ind;
    1.23  }
    1.24  
    1.25 @@ -1204,7 +1205,7 @@
    1.26  	// Find current parent and 
    1.27  	// remove pointer to myself there
    1.28  	if (!dst) return NULL;
    1.29 -	BranchObj *par=(BranchObj*)(parObj);
    1.30 +	BranchObj *par=(BranchObj*)parObj;
    1.31  	if (par)
    1.32  		par->removeBranchPtr (this);
    1.33  	else