[GME-commit] GMESRC/GME/Mga MgaComplexOps.cpp,1.18,1.19 MgaComplexOps.h,1.2,1.3

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

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

Modified Files:
	MgaComplexOps.cpp MgaComplexOps.h 
Log Message:
Compilation was not OK.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: MgaComplexOps.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaComplexOps.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MgaComplexOps.cpp	8 May 2006 16:27:57 -0000	1.18
--- MgaComplexOps.cpp	8 May 2006 20:12:55 -0000	1.19
***************
*** 3,6 ****
--- 3,8 ----
  #include "MgaFCO.h"
  #include <map>
+ #include "MgaComplexOps.h"
+ #include "MgaSet.h"
  
  /////////////////////////////////////////////////////////////////////////////////////////////////////
***************
*** 9,13 ****
  
  
! void SingleObjTreeDelete(CoreObj &self, bool deleteself = true) {
  	CComPtr<ICoreAttributes> atts;
  	COMTHROW(self->get_Attributes(&atts));
--- 11,15 ----
  
  
! void SingleObjTreeDelete(CoreObj &self, bool deleteself) {
  	CComPtr<ICoreAttributes> atts;
  	COMTHROW(self->get_Attributes(&atts));

Index: MgaComplexOps.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaComplexOps.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MgaComplexOps.h	13 Oct 2004 15:17:55 -0000	1.2
--- MgaComplexOps.h	8 May 2006 20:12:55 -0000	1.3
***************
*** 2,5 ****
--- 2,7 ----
  #define MGACOMPLEXOPS_H_1093481093485091384
  
+ class PointerFixup;
+ 
  void CheckConflict(CoreObj &b, CoreObj &root);
  int GetRealSubtypeDist(CoreObj oldobj);
***************
*** 28,31 ****
--- 30,34 ----
  void DeriveMoveds(CMgaProject *mgaproject, std::vector<CoreObj> &orignobjs, std::vector<int> &extmoved, int cnt, int targetlevel);
  
+ void SingleObjTreeDelete(CoreObj &self, bool deleteself = true); 
  
  #endif //MGACOMPLEXOPS_H_1093481093485091384