[GME-commit] GMESRC/Tools/GMEMerge Merge.cpp,1.2,1.3

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

Update of /project/gme-repository/GMESRC/Tools/GMEMerge
In directory escher:/tmp/cvs-serv6875

Modified Files:
	Merge.cpp 
Log Message:
no message

CVS User: Gyorgy Balogh, ISIS (bogyom)

Index: Merge.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Tools/GMEMerge/Merge.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Merge.cpp	15 Aug 2006 21:56:26 -0000	1.2
--- Merge.cpp	16 Aug 2006 14:50:37 -0000	1.3
***************
*** 123,127 ****
  			ObjMap::iterator it2 = mergin.find(it->first);
  			if( it2 == mergin.end() )
! 				destroy.push_back( it->second );				
  		}
  		it++;
--- 123,127 ----
  			ObjMap::iterator it2 = mergin.find(it->first);
  			if( it2 == mergin.end() )
! 				destroy.push_back( it->second );
  		}
  		it++;
***************
*** 934,937 ****
--- 934,938 ----
  	CComPtr<IMgaRegNode> node;
  	CComBSTR			 val;
+ 	CComBSTR			 path = "inClosure";
  	int					 type = getType(obj);
  
***************
*** 940,944 ****
  		CComPtr<IMgaFCO> fco;
  		COMTHROW( obj->QueryInterface(&fco) );
! 		COMTHROW( fco->get_RegistryNode(L"inClosure", &node ) );
  	}
  	else if( type == OBJTYPE_FOLDER )
--- 941,945 ----
  		CComPtr<IMgaFCO> fco;
  		COMTHROW( obj->QueryInterface(&fco) );
! 		COMTHROW( fco->get_RegistryNode(path, &node ) );
  	}
  	else if( type == OBJTYPE_FOLDER )
***************
*** 946,951 ****
  		CComPtr<IMgaFolder> folder;
  		COMTHROW( obj->QueryInterface(&folder) );
! 		COMTHROW( folder->get_RegistryNode(L"inClosure", &node ) );
! 
  	}
  	else
--- 947,951 ----
  		CComPtr<IMgaFolder> folder;
  		COMTHROW( obj->QueryInterface(&folder) );
! 		COMTHROW( folder->get_RegistryNode(path, &node ) );
  	}
  	else