[GME-commit] GMESRC/GME/Core Core.vcproj,NONE,1.1 Core.cpp,1.6,1.7 Core.def,1.1,1.2 CoreAttribute.h,1.12,1.13 CoreBinFile.cpp,1.16,1.17 CoreBinFile.h,1.10,1.11 CoreProject.cpp,1.15,1.16 StdAfx.cpp,1.1,1.2 Core.dsp,1.15,NONE

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:30 CST 2005


Update of /var/lib/gme/GMESRC/GME/Core
In directory braindrain:/tmp/cvs-serv19193/GME/Core

Modified Files:
	Core.cpp Core.def CoreAttribute.h CoreBinFile.cpp 
	CoreBinFile.h CoreProject.cpp StdAfx.cpp 
Added Files:
	Core.vcproj 
Removed Files:
	Core.dsp 
Log Message:
Checkin for VC7.1 upgrade


CVS User: zolmol

--- NEW FILE: Core.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="Core"
	SccProjectName=""
	SccLocalPath=""
	Keyword="AtlProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\Debug"
			IntermediateDirectory=".\Debug"
			ConfigurationType="2"
			UseOfMFC="0"
			UseOfATL="2"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2"
			ManagedExtensions="FALSE">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../Include/ODBC,../Include/repository,../Interfaces,../Include/stlport,../Common,../Gme"
				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				DisableLanguageExtensions="FALSE"
				UsePrecompiledHeader="3"
				PrecompiledHeaderThrough="StdAfx.h"
				PrecompiledHeaderFile=".\Debug/Core.pch"
				AssemblerListingLocation=".\Debug/"
				ObjectFile=".\Debug/"
				ProgramDataBaseFileName=".\Debug/"
				BrowseInformation="1"
				BrowseInformationFile=".\Debug/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="3"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"
				Description="Performing registration"
				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
"
				Outputs="$(OutDir)\regsvr32.trg"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile=".\Debug/Core.dll"
				LinkIncremental="2"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="..\lib"
				ModuleDefinitionFile=".\Core.def"
				GenerateDebugInformation="TRUE"
				AssemblyDebug="1"
				ProgramDatabaseFile=".\Debug/Core.pdb"
				GenerateMapFile="TRUE"
				MapFileName=".\Debug/Core.map"
				SubSystem="2"
				BaseAddress="0x60300000"
				ImportLibrary=".\Debug/Core.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName=".\Debug/Core.tlb"
				HeaderFileName=""/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1033"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory=".\Release"
			IntermediateDirectory=".\Release"
			ConfigurationType="2"
			UseOfMFC="0"
			UseOfATL="2"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="1"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="../Include/repository,../Include/ODBC,../Interfaces,../Include/STLport,../Common,../Gme"
				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"
				StringPooling="TRUE"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="TRUE"
				UsePrecompiledHeader="3"
				PrecompiledHeaderThrough="StdAfx.h"
				PrecompiledHeaderFile=".\Release/Core.pch"
				AssemblerListingLocation=".\Release/"
				ObjectFile=".\Release/"
				ProgramDataBaseFileName=".\Release/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="3"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"
				Description="Performing registration"
				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
"
				Outputs="$(OutDir)\regsvr32.trg"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile=".\Release/Core.dll"
				LinkIncremental="1"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="..\lib"
				ModuleDefinitionFile=".\Core.def"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\Release/Core.pdb"
				GenerateMapFile="TRUE"
				MapFileName=".\Release/Core.map"
				SubSystem="2"
				BaseAddress="0x60300000"
				ImportLibrary=".\Release/Core.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName=".\Release/Core.tlb"
				HeaderFileName=""/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1033"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
			<File
				RelativePath="Core.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Core.def">
			</File>
			<File
				RelativePath="Core.rc">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCResourceCompilerTool"
						PreprocessorDefinitions=""
						AdditionalIncludeDirectories="$(OUTDIR)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCResourceCompilerTool"
						PreprocessorDefinitions=""
						AdditionalIncludeDirectories="$(OUTDIR)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreAttribute.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreBinFile.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreLib.idl">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCMIDLTool"
						AdditionalIncludeDirectories="../Interfaces"
						GenerateStublessProxies="TRUE"
						TypeLibraryName=".\CoreLib.tlb"
						HeaderFileName="CoreLib.h"
						InterfaceIdentifierFileName="CoreLib_i.c"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCMIDLTool"
						AdditionalIncludeDirectories="../Interfaces"
						GenerateStublessProxies="TRUE"
						TypeLibraryName=".\CoreLib.tlb"
						HeaderFileName="CoreLib.h"
						InterfaceIdentifierFileName="CoreLib_i.c"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreMetaAttribute.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreMetaObject.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreMetaProject.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreObject.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreODBC.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreProject.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreRepository.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreTerritory.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="CoreUtilities.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="dlldatax.c">
				<FileConfiguration
					Name="Debug|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="StdAfx.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="_DEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						UsePrecompiledHeader="1"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="NDEBUG;_ATL_DLL;WIN32;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						UsePrecompiledHeader="1"/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl">
			<File
				RelativePath="CoreAttribute.h">
			</File>
			<File
				RelativePath="CoreBinFile.h">
			</File>
			<File
				RelativePath="CoreMetaAttribute.h">
			</File>
			<File
				RelativePath="CoreMetaObject.h">
			</File>
			<File
				RelativePath="CoreMetaProject.h">
			</File>
			<File
				RelativePath="CoreObject.h">
			</File>
			<File
				RelativePath="CoreODBC.h">
			</File>
			<File
				RelativePath="CoreProject.h">
			</File>
			<File
				RelativePath="CoreRepository.h">
			</File>
			<File
				RelativePath="CoreTerritory.h">
			</File>
			<File
				RelativePath="CoreTransactionItem.h">
			</File>
			<File
				RelativePath="CoreUtilities.h">
			</File>
			<File
				RelativePath="dlldatax.h">
				<FileConfiguration
					Name="Debug|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCustomBuildTool"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCustomBuildTool"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Resource.h">
			</File>
			<File
				RelativePath="StdAfx.h">
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
			<File
				RelativePath="CoreBinFile.rgs">
			</File>
			<File
				RelativePath="CoreMetaProject.rgs">
			</File>
			<File
				RelativePath="CoreODBC.rgs">
			</File>
			<File
				RelativePath="CoreProject.rgs">
			</File>
			<File
				RelativePath="CoreRepository.rgs">
			</File>
			<File
				RelativePath="MetaStaticProject.rgs">
			</File>
		</Filter>
		<Filter
			Name="Documentation Files"
			Filter="txt">
			<File
				RelativePath="ControlFlow.txt">
			</File>
			<File
				RelativePath="Decisions.txt">
			</File>
			<File
				RelativePath="Garbage.txt">
			</File>
			<File
				RelativePath="Objects.txt">
			</File>
			<File
				RelativePath="todo.txt">
			</File>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

Index: Core.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/Core.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Core.cpp	21 Sep 2001 19:44:00 -0000	1.6
--- Core.cpp	26 Jan 2005 17:28:24 -0000	1.7
***************
*** 128,132 ****
  		if(!oldobj) {
  			COMTHROW(newobj->get_Project(&proj1));
! 			if(proj1->get_Name != CCoreMetaProject::get_Name) return E_SAMEPROJECT;
  		}
  		else {
--- 128,133 ----
  		if(!oldobj) {
  			COMTHROW(newobj->get_Project(&proj1));
! 			//instead of proj1->get_Name
! 			if( CCoreMetaProject::get_Name != ICoreMetaProject::get_Name) return E_SAMEPROJECT;
  		}
  		else {
***************
*** 154,158 ****
  		if(!oldobj) {
  			COMTHROW(newobj->get_Project(&proj1));
! 			if(proj1->OpenProject != CCoreProject::OpenProject) return E_SAMEPROJECT;
  		}
  		else {
--- 155,160 ----
  		if(!oldobj) {
  			COMTHROW(newobj->get_Project(&proj1));
! 			//instead of proj1->OpenProject
! 			if( CCoreProject::OpenProject != ICoreProject::OpenProject) return E_SAMEPROJECT;
  		}
  		else {

Index: Core.def
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/Core.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Core.def	5 Jul 2000 19:16:00 -0000	1.1
--- Core.def	26 Jan 2005 17:28:24 -0000	1.2
***************
*** 4,9 ****
  
  EXPORTS
! 	DllCanUnloadNow     @1 PRIVATE
! 	DllGetClassObject   @2 PRIVATE
! 	DllRegisterServer   @3 PRIVATE
! 	DllUnregisterServer	@4 PRIVATE
--- 4,9 ----
  
  EXPORTS
! 	DllCanUnloadNow     PRIVATE
! 	DllGetClassObject   PRIVATE
! 	DllRegisterServer   PRIVATE
! 	DllUnregisterServer	PRIVATE

Index: CoreAttribute.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreAttribute.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CoreAttribute.h	13 Oct 2004 15:17:54 -0000	1.12
--- CoreAttribute.h	26 Jan 2005 17:28:24 -0000	1.13
***************
*** 226,230 ****
  
  	typedef std::list<value_type> values_type;
! 	typedef values_type::iterator values_iterator;
  
  protected:
--- 226,230 ----
  
  	typedef std::list<value_type> values_type;
! 	typedef typename values_type::iterator values_iterator;
  
  protected:

Index: CoreBinFile.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreBinFile.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CoreBinFile.cpp	13 Oct 2004 15:17:54 -0000	1.16
--- CoreBinFile.cpp	26 Jan 2005 17:28:24 -0000	1.17
***************
*** 437,441 ****
  	b.resize(len);
  	if( len > 0 )
! 		ifs.read( (char *) b.begin(), len);//zolmol!
  }
  
--- 437,441 ----
  	b.resize(len);
  	if( len > 0 )
! 		ifs.read( (char *) b.begin(), len);
  }
  
***************
*** 453,457 ****
  	s.resize(len);
  	if( len > 0 )
! 		ifs.read( (char *) s.begin(), len);//zolmol!
  
  	CopyTo(s, ss);
--- 453,457 ----
  	s.resize(len);
  	if( len > 0 )
! 		ifs.read( (char *) s.begin(), len);
  
  	CopyTo(s, ss);
***************
*** 468,472 ****
  
  	if( len > 0 )
! 		ofs.write( (const char *) b.begin(), len);//zolmol!
  }
  
--- 468,472 ----
  
  	if( len > 0 )
! 		ofs.write( (const char *) b.begin(), len);
  }
  
***************
*** 484,488 ****
  
  	if( len > 0 )
! 		ofs.write( (const char *) s.begin(), len);//zolmol!
  }
  
--- 484,488 ----
  
  	if( len > 0 )
! 		ofs.write( (const char *) s.begin(), len);
  }
  
***************
*** 725,729 ****
  	InitMaxObjIDs();
  
! 	ifs.open(filename.c_str(), std::ios::in | std::ios::binary);//zolmol!//previously ios::nocreate had been used but no file is created if opened for read only
  	if( ifs.fail() )
  		HR_THROW(E_FILEOPEN);
--- 725,729 ----
  	InitMaxObjIDs();
  
! 	ifs.open(filename.c_str(), std::ios::in | std::ios::binary);//previously ios::nocreate had been used but no file is created if opened for read only
  	if( ifs.fail() )
  		HR_THROW(E_FILEOPEN);
***************
*** 1005,1148 ****
  
  // --------------------------- BinAttr<VALTYPE_POINTER>
! 
! template<>
! void BinAttr<VALTYPE_POINTER>::Get(CCoreBinFile *binfile, VARIANT *p) const
! {
! 	if( a == no_object )
! 	{
! 		metaobjidpair_type idpair;
! 		idpair.metaid = METAID_NONE;
! 		idpair.objid = OBJID_NONE;
! 		CopyTo(idpair, p);
! 	}
! 	else
! 		CopyTo(a->first, p);
! }
! 
! template<>
! void BinAttr<VALTYPE_POINTER>::Set(CCoreBinFile *binfile, objects_iterator b)
! {
! 	ASSERT( binfile != NULL );
! 	ASSERT( a == no_object );
! 	ASSERT( b != no_object && b != binfile->objects.end() );
! 
! 	binfile->modified = true;
! 
! 	a = b;
! 
! 	ASSERT( binfile->opened_object->second.Find(attrid) == this );
! 
! 	BinAttrBase *base = a->second.Find(attrid + ATTRID_COLLECTION);
! 	ASSERT( base != NULL );
! 	
! 	ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! 	std::vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;
! 
! #ifdef DEBUG_CONTAINERS
! 	std::vector<objects_iterator>::iterator i = find(objs.begin(), objs.end(), a);
! 	ASSERT( i == objs.end() );
! #endif
! 
! 	objs.push_back(binfile->opened_object);
! }
! 
! template<>
! void BinAttr<VALTYPE_POINTER>::Set(CCoreBinFile *binfile, VARIANT p)
! {
! 	if( a != no_object )
! 	{
! 		BinAttrBase *base = a->second.Find(attrid + ATTRID_COLLECTION);
! 		ASSERT( base != NULL );
! 		
! 		ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! 		std::vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;
! 
! 		ASSERT( binfile->opened_object->second.Find(attrid) == this );
! 
! 		std::vector<objects_iterator>::iterator i = std::find(objs.begin(), objs.end(), binfile->opened_object);
! 		ASSERT( i != objs.end() );
! 
! 		objs.erase(i);
! 	}
! 
! 	a = no_object;
! 
! 	metaobjidpair_type idpair;
! 	CopyTo(p, idpair);
! 
! 	if( idpair.metaid == METAID_NONE )
! 	{
! 		ASSERT( idpair.objid == OBJID_NONE );
! 	}
! 	else
! 	{
! 		ASSERT( idpair.objid != OBJID_NONE );
! 
! 		Set(binfile, binfile->objects.find(idpair));
! 	}
! }
! 
! template<>
! void BinAttr<VALTYPE_POINTER>::Write(CCoreBinFile *binfile) const
! {
! 	if( a == no_object )
! 	{
! 		binfile->write((metaid_type)METAID_NONE);
! 	}
! 	else
! 	{
! 		ASSERT( a->first.metaid != METAID_NONE );
! 		ASSERT( a->first.objid != OBJID_NONE );
! 
! 		binfile->write((metaid_type)a->first.metaid);
! 		binfile->write((objid_type)a->first.objid);
! 	}
! }
! 
! template<>
! void BinAttr<VALTYPE_POINTER>::Read(CCoreBinFile *binfile)
! {
! 	ASSERT( a == no_object );
! 
! 	metaid_type metaid;
! 	binfile->read(metaid);
! 
! 	if( metaid != METAID_NONE )
! 	{
! 		objid_type objid;
! 		binfile->read(objid);
! 
! 		ASSERT( objid != OBJID_NONE );
! 
! 		binfile->resolvelist.push_front();
! 		CCoreBinFile::resolve_type &b = binfile->resolvelist.front();
! 
! 		ASSERT( binfile->opened_object != no_object );
! 
! 		b.obj = binfile->opened_object;
! 		b.attrid = attrid;
! 		b.idpair.metaid = metaid;
! 		b.idpair.objid = objid;
! 	}
! }
  
  // --------------------------- BinAttr<VALTYPE_COLLECTION>
  
! template<>
! void BinAttr<VALTYPE_COLLECTION>::Get(CCoreBinFile *binfile, VARIANT *p) const
! {
! 	ASSERT( p != NULL && p->vt == VT_EMPTY );
! 
! 	std::vector<metaobjidpair_type> idpairs;
! 
! 	std::vector<objects_iterator>::const_iterator i = a.begin();
! 	std::vector<objects_iterator>::const_iterator e = a.end();
! 	while( i != e )
! 	{
! 		idpairs.push_back( (*i)->first );
! 
! 		++i;
! 	}
! 
! 	CopyTo(idpairs, p);
! }
--- 1005,1148 ----
  
  // --------------------------- BinAttr<VALTYPE_POINTER>
! //moved to the header file
! //template<> 
! //void BinAttr<VALTYPE_POINTER>::Get(CCoreBinFile *binfile, VARIANT *p) const
! //{
! //	if( a == no_object )
! //	{
! //		metaobjidpair_type idpair;
! //		idpair.metaid = METAID_NONE;
! //		idpair.objid = OBJID_NONE;
! //		CopyTo(idpair, p);
! //	}
! //	else
! //		CopyTo(a->first, p);
! //}
! //
! //template<>
! //void BinAttr<VALTYPE_POINTER>::Set(CCoreBinFile *binfile, objects_iterator b)
! //{
! //	ASSERT( binfile != NULL );
! //	ASSERT( a == no_object );
! //	ASSERT( b != no_object && b != binfile->objects.end() );
! //
! //	binfile->modified = true;
! //
! //	a = b;
! //
! //	ASSERT( binfile->opened_object->second.Find(attrid) == this );
! //
! //	BinAttrBase *base = a->second.Find(attrid + ATTRID_COLLECTION);
! //	ASSERT( base != NULL );
! //	
! //	ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! //	std::vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;
! //
! //#ifdef DEBUG_CONTAINERS
! //	std::vector<objects_iterator>::iterator i = find(objs.begin(), objs.end(), a);
! //	ASSERT( i == objs.end() );
! //#endif
! //
! //	objs.push_back(binfile->opened_object);
! //}
! //
! //template<>
! //void BinAttr<VALTYPE_POINTER>::Set(CCoreBinFile *binfile, VARIANT p)
! //{
! //	if( a != no_object )
! //	{
! //		BinAttrBase *base = a->second.Find(attrid + ATTRID_COLLECTION);
! //		ASSERT( base != NULL );
! //		
! //		ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! //		std::vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;
! //
! //		ASSERT( binfile->opened_object->second.Find(attrid) == this );
! //
! //		std::vector<objects_iterator>::iterator i = std::find(objs.begin(), objs.end(), binfile->opened_object);
! //		ASSERT( i != objs.end() );
! //
! //		objs.erase(i);
! //	}
! //
! //	a = no_object;
! //
! //	metaobjidpair_type idpair;
! //	CopyTo(p, idpair);
! //
! //	if( idpair.metaid == METAID_NONE )
! //	{
! //		ASSERT( idpair.objid == OBJID_NONE );
! //	}
! //	else
! //	{
! //		ASSERT( idpair.objid != OBJID_NONE );
! //
! //		Set(binfile, binfile->objects.find(idpair));
! //	}
! //}
! //
! //template<>
! //void BinAttr<VALTYPE_POINTER>::Write(CCoreBinFile *binfile) const
! //{
! //	if( a == no_object )
! //	{
! //		binfile->write((metaid_type)METAID_NONE);
! //	}
! //	else
! //	{
! //		ASSERT( a->first.metaid != METAID_NONE );
! //		ASSERT( a->first.objid != OBJID_NONE );
! //
! //		binfile->write((metaid_type)a->first.metaid);
! //		binfile->write((objid_type)a->first.objid);
! //	}
! //}
! //
! //template<>
! //void BinAttr<VALTYPE_POINTER>::Read(CCoreBinFile *binfile)
! //{
! //	ASSERT( a == no_object );
! //
! //	metaid_type metaid;
! //	binfile->read(metaid);
! //
! //	if( metaid != METAID_NONE )
! //	{
! //		objid_type objid;
! //		binfile->read(objid);
! //
! //		ASSERT( objid != OBJID_NONE );
! //
! //		binfile->resolvelist.push_front();
! //		CCoreBinFile::resolve_type &b = binfile->resolvelist.front();
! //
! //		ASSERT( binfile->opened_object != no_object );
! //
! //		b.obj = binfile->opened_object;
! //		b.attrid = attrid;
! //		b.idpair.metaid = metaid;
! //		b.idpair.objid = objid;
! //	}
! //}
  
  // --------------------------- BinAttr<VALTYPE_COLLECTION>
  
! //template<>
! //void BinAttr<VALTYPE_COLLECTION>::Get(CCoreBinFile *binfile, VARIANT *p) const
! //{
! //	ASSERT( p != NULL && p->vt == VT_EMPTY );
! //
! //	std::vector<metaobjidpair_type> idpairs;
! //
! //	std::vector<objects_iterator>::const_iterator i = a.begin();
! //	std::vector<objects_iterator>::const_iterator e = a.end();
! //	while( i != e )
! //	{
! //		idpairs.push_back( (*i)->first );
! //
! //		++i;
! //	}
! //
! //	CopyTo(idpairs, p);
! //}

Index: CoreBinFile.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreBinFile.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CoreBinFile.h	13 Oct 2004 15:17:54 -0000	1.10
--- CoreBinFile.h	26 Jan 2005 17:28:24 -0000	1.11
***************
*** 6,9 ****
--- 6,10 ----
  #include <list>//slist
  #include <hash_map>
+ #include <vector>
  
  class CCoreBinFile;
***************
*** 31,35 ****
  typedef binattrs_type::iterator binattrs_iterator;
  
! template<int VALTYPE>
  class BinAttr;
  
--- 32,36 ----
  typedef binattrs_type::iterator binattrs_iterator;
  
! template<valtype_enum VALTYPE>
  class BinAttr;
  
***************
*** 140,144 ****
  
  public:
! 	void read(unsigned char &a) { ifs.read((char*)&a, sizeof(char)); }//zolmol! 5 times
  	void read(short &a) { ifs.read((char*)&a, sizeof(short)); }
  	void read(int &a) { ifs.read((char*)&a, sizeof(int)); }
--- 141,145 ----
  
  public:
! 	void read(unsigned char &a) { ifs.read((char*)&a, sizeof(char)); }
  	void read(short &a) { ifs.read((char*)&a, sizeof(short)); }
  	void read(int &a) { ifs.read((char*)&a, sizeof(int)); }
***************
*** 148,152 ****
  	void read(bindata &a);
  
! 	void write(unsigned char a) { ofs.write((const char*)&a, sizeof(unsigned char)); }//zolmol! 5 times
  	void write(short a) { ofs.write((const char*)&a, sizeof(short)); }
  	void write(int a) { ofs.write((const char*)&a, sizeof(int)); }
--- 149,153 ----
  	void read(bindata &a);
  
! 	void write(unsigned char a) { ofs.write((const char*)&a, sizeof(unsigned char)); }
  	void write(short a) { ofs.write((const char*)&a, sizeof(short)); }
  	void write(int a) { ofs.write((const char*)&a, sizeof(int)); }
***************
*** 330,338 ****
  
  	virtual valtype_type GetValType() const NOTHROW { return VALTYPE_POINTER; }
! 	void Set(CCoreBinFile *binfile, objects_iterator a);
! 	virtual void Set(CCoreBinFile *binfile, VARIANT p);
! 	virtual void Get(CCoreBinFile *binfile, VARIANT *p) const;
! 	virtual void Write(CCoreBinFile *binfile) const;
! 	virtual void Read(CCoreBinFile *binfile);
  };
  
--- 331,449 ----
  
  	virtual valtype_type GetValType() const NOTHROW { return VALTYPE_POINTER; }
! 
! 	void Set(CCoreBinFile *binfile, objects_iterator b)
! 	{
! 		ASSERT( binfile != NULL );
! 		ASSERT( a == no_object );
! 		ASSERT( b != no_object && b != binfile->objects.end() );
! 
! 		binfile->modified = true;
! 
! 		a = b;
! 
! 		ASSERT( binfile->opened_object->second.Find(attrid) == this );
! 
! 		BinAttrBase *base = a->second.Find(attrid + ATTRID_COLLECTION);
! 		ASSERT( base != NULL );
! 		
! 		ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! 		std::vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;
! 
! 	#ifdef DEBUG_CONTAINERS
! 		std::vector<objects_iterator>::iterator i = find(objs.begin(), objs.end(), a);
! 		ASSERT( i == objs.end() );
! 	#endif
! 
! 		objs.push_back(binfile->opened_object);
! 	}
! 
! 	virtual void Set(CCoreBinFile *binfile, VARIANT p)
! 	{
! 		if( a != no_object )
! 		{
! 			BinAttrBase *base = a->second.Find(attrid + ATTRID_COLLECTION);
! 			ASSERT( base != NULL );
! 			
! 			ASSERT( base->GetValType() == VALTYPE_COLLECTION );
! 			std::vector<objects_iterator> &objs = ((BinAttr<VALTYPE_COLLECTION>*)base)->a;
! 
! 			ASSERT( binfile->opened_object->second.Find(attrid) == this );
! 
! 			std::vector<objects_iterator>::iterator i = std::find(objs.begin(), objs.end(), binfile->opened_object);
! 			ASSERT( i != objs.end() );
! 
! 			objs.erase(i);
! 		}
! 
! 		a = no_object;
! 
! 		metaobjidpair_type idpair;
! 		CopyTo(p, idpair);
! 
! 		if( idpair.metaid == METAID_NONE )
! 		{
! 			ASSERT( idpair.objid == OBJID_NONE );
! 		}
! 		else
! 		{
! 			ASSERT( idpair.objid != OBJID_NONE );
! 
! 			Set(binfile, binfile->objects.find(idpair));
! 		}
! 	}
! 	virtual void Get(CCoreBinFile *binfile, VARIANT *p) const
! 	{
! 		if( a == no_object )
! 		{
! 			metaobjidpair_type idpair;
! 			idpair.metaid = METAID_NONE;
! 			idpair.objid = OBJID_NONE;
! 			CopyTo(idpair, p);
! 		}
! 		else
! 			CopyTo(a->first, p);
! 	}
! 
! 	virtual void Write(CCoreBinFile *binfile) const
! 	{
! 		if( a == no_object )
! 		{
! 			binfile->write((metaid_type)METAID_NONE);
! 		}
! 		else
! 		{
! 			ASSERT( a->first.metaid != METAID_NONE );
! 			ASSERT( a->first.objid != OBJID_NONE );
! 
! 			binfile->write((metaid_type)a->first.metaid);
! 			binfile->write((objid_type)a->first.objid);
! 		}
! 	}
! 
! 	virtual void Read(CCoreBinFile *binfile)
! 	{
! 		ASSERT( a == no_object );
! 
! 		metaid_type metaid;
! 		binfile->read(metaid);
! 
! 		if( metaid != METAID_NONE )
! 		{
! 			objid_type objid;
! 			binfile->read(objid);
! 
! 			ASSERT( objid != OBJID_NONE );
! 
! 			binfile->resolvelist.push_front();
! 			CCoreBinFile::resolve_type &b = binfile->resolvelist.front();
! 
! 			ASSERT( binfile->opened_object != no_object );
! 
! 			b.obj = binfile->opened_object;
! 			b.attrid = attrid;
! 			b.idpair.metaid = metaid;
! 			b.idpair.objid = objid;
! 		}
! 	}
  };
  
***************
*** 347,351 ****
  	virtual valtype_type GetValType() const NOTHROW { return VALTYPE_COLLECTION; }
  	virtual void Set(CCoreBinFile *binfile, VARIANT p) { ASSERT(false); }
! 	virtual void Get(CCoreBinFile *binfile, VARIANT *p) const;
  	virtual void Write(CCoreBinFile *binfile) const { }
  	virtual void Read(CCoreBinFile *binfile) { }
--- 458,478 ----
  	virtual valtype_type GetValType() const NOTHROW { return VALTYPE_COLLECTION; }
  	virtual void Set(CCoreBinFile *binfile, VARIANT p) { ASSERT(false); }
! 	virtual void Get(CCoreBinFile *binfile, VARIANT *p) const
! 	{
! 		ASSERT( p != NULL && p->vt == VT_EMPTY );
! 
! 		std::vector<metaobjidpair_type> idpairs;
! 
! 		std::vector<objects_iterator>::const_iterator i = a.begin();
! 		std::vector<objects_iterator>::const_iterator e = a.end();
! 		while( i != e )
! 		{
! 			idpairs.push_back( (*i)->first );
! 
! 			++i;
! 		}
! 
! 		CopyTo(idpairs, p);
! 	}
  	virtual void Write(CCoreBinFile *binfile) const { }
  	virtual void Read(CCoreBinFile *binfile) { }

Index: CoreProject.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/CoreProject.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CoreProject.cpp	9 Nov 2004 20:11:45 -0000	1.15
--- CoreProject.cpp	26 Jan 2005 17:28:24 -0000	1.16
***************
*** 467,473 ****
  STDMETHODIMP CCoreProject::UndoTransaction()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );//zolmol!
  
! 	if( storage == NULL || InTransaction() || (int) undos.size() <= redo_count )//zolmol!
  		COMRETURN(E_INVALID_USAGE);
  
--- 467,473 ----
  STDMETHODIMP CCoreProject::UndoTransaction()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );
  
! 	if( storage == NULL || InTransaction() || (int) undos.size() <= redo_count )
  		COMRETURN(E_INVALID_USAGE);
  
***************
*** 481,485 ****
  STDMETHODIMP CCoreProject::RedoTransaction()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );//zolmol!
  
  	if( storage == NULL || InTransaction() || redo_count <= 0 )
--- 481,485 ----
  STDMETHODIMP CCoreProject::RedoTransaction()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );
  
  	if( storage == NULL || InTransaction() || redo_count <= 0 )
***************
*** 495,499 ****
  STDMETHODIMP CCoreProject::FlushUndoQueue()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );//zolmol!
  
  	if( storage == NULL || InTransaction() )
--- 495,499 ----
  STDMETHODIMP CCoreProject::FlushUndoQueue()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );
  
  	if( storage == NULL || InTransaction() )
***************
*** 510,514 ****
  STDMETHODIMP CCoreProject::FlushRedoQueue()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );//zolmol!
  
  	if( storage == NULL || InTransaction() )
--- 510,514 ----
  STDMETHODIMP CCoreProject::FlushRedoQueue()
  {
! 	ASSERT( (int) undos.size() >= redo_count && redo_count >= 0 );
  
  	if( storage == NULL || InTransaction() )
***************
*** 527,531 ****
  	CHECK_OUT(p);
  
! 	ASSERT( (int) undos.size() >= redo_count );//zolmol!
  	*p = undos.size() - redo_count - (InTransaction() ? 1 : 0);
  	ASSERT( *p >= 0 );
--- 527,531 ----
  	CHECK_OUT(p);
  
! 	ASSERT( (int) undos.size() >= redo_count );
  	*p = undos.size() - redo_count - (InTransaction() ? 1 : 0);
  	ASSERT( *p >= 0 );
***************
*** 538,542 ****
  	CHECK_OUT(p);
  
! 	ASSERT( (int) undos.size() >= redo_count );//zolmol!
  	*p = redo_count;
  
--- 538,542 ----
  	CHECK_OUT(p);
  
! 	ASSERT( (int) undos.size() >= redo_count );
  	*p = redo_count;
  
***************
*** 1015,1019 ****
  
  	i = transactions.front().items.begin();
! 	e = transactions.front().items.end();
  	while( i != e )
  	{
--- 1015,1019 ----
  
  	i = transactions.front().items.begin();
! 	e = transactions.front().items.end(); // bug correction [zolmol]
  	while( i != e )
  	{

Index: StdAfx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Core/StdAfx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.cpp	5 Jul 2000 19:16:00 -0000	1.1
--- StdAfx.cpp	26 Jan 2005 17:28:24 -0000	1.2
***************
*** 7,12 ****
  #ifdef _ATL_STATIC_REGISTRY
  #include <statreg.h>
- #include <statreg.cpp>
  #endif
  
- #include <atlimpl.cpp>
--- 7,10 ----

--- Core.dsp DELETED ---



More information about the GME-commit mailing list