[GME-commit] GMESRC/GME/Mga MgaFCO.h,1.21,1.22

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

Update of /project/gme-repository/GMESRC/GME/Mga
In directory escher:/tmp/cvs-serv11023

Modified Files:
	MgaFCO.h 
Log Message:


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MgaFCO.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaFCO.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MgaFCO.h	26 Jan 2005 17:30:47 -0000	1.21
--- MgaFCO.h	30 Aug 2005 22:27:49 -0000	1.22
***************
*** 576,579 ****
--- 576,580 ----
  void ObjTreeDerive(CMgaProject *mgaproject, const CoreObj &origobj, CoreObj &newobj, coreobjpairhash &crealist, long instance);
  bool ObjTreeReconnect(CoreObj self, coreobjpairhash &crealist, CoreObj const &derivtgt = NULLCOREOBJ);
+ void ObjDetachAndMerge( CMgaProject *mgaproject, CoreObj orig, CoreObj &nobj, coreobjpairhash& crealist, unsigned long nextrelid, bool prim);