[GME-commit] GMESRC/GME/Core CoreProject.cpp, 1.18, 1.19 CoreTerritory.cpp, 1.6, 1.7

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Core
In directory escher:/tmp/cvs-serv4657

Modified Files:
	CoreProject.cpp CoreTerritory.cpp 
Log Message:
Rolling back changed done a day before.
CoreTerritory 1.7 should be equal with 1.5
CoreProject   1.19 should be equal with 1.17




CVS User: Zoltan Molnar, ISIS (zolmol)

Index: CoreTerritory.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Core/CoreTerritory.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CoreTerritory.cpp	16 Jun 2007 22:47:41 -0000	1.6
--- CoreTerritory.cpp	18 Jun 2007 01:56:09 -0000	1.7
***************
*** 27,31 ****
  	territory->project = project;
  	project->RegisterTerritory(territory);
- 	project->Release();// do not add ref to project to avoid cross reference // zolmol
  
  	return territory;
--- 27,30 ----
***************
*** 40,47 ****
  
  	project->UnregisterTerritory(this);
- 	project.Detach(); // project member is not refcounted by us // zolmol
  
  #ifdef _DEBUG
! 	//project = NULL; // not needed, taken care of above in ::Create // zolmol
  #endif
  }
--- 39,45 ----
  
  	project->UnregisterTerritory(this);
  
  #ifdef _DEBUG
! 	project = NULL;
  #endif
  }

Index: CoreProject.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Core/CoreProject.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CoreProject.cpp	16 Jun 2007 22:47:41 -0000	1.18
--- CoreProject.cpp	18 Jun 2007 01:56:09 -0000	1.19
***************
*** 26,33 ****
  	put_Storage(NULL);
  
- 	object_lookup.clear();         // zolmol
- 	pushed_territorys.clear();     // 
- 	created_territorys.clear();    // end
- 
  	ASSERT( transactions.empty() );
  	ASSERT( finaltr_items.empty() );
--- 26,29 ----
***************
*** 133,140 ****
  			metaproject = CastToMetaProject(p);
  		}
- 		else // newly added
- 		{
- 			created_territorys.clear();
- 		}
  	}
  	COMCATCH(;)
--- 129,132 ----
***************
*** 797,802 ****
  
  	created_territorys.push_front(territory);
- 	ASSERT( find(created_territorys.begin(), created_territorys.end(), territory) !=
- 		created_territorys.end() );
  }
  
--- 789,792 ----
***************
*** 812,817 ****
  
  	created_territorys.remove(territory);
- 	ASSERT( find(created_territorys.begin(), created_territorys.end(), territory) ==
- 		created_territorys.end() );
  }
  
--- 802,805 ----