[GME-commit] GMESRC/GME/Parser Parser.vcproj,NONE,1.1 GenParser.cpp,1.11,1.12 MgaParser.cpp,1.27,1.28 MgaParserBC.cpp,1.4,1.5 MgaParserSC.cpp,1.3,1.4 Parser.def,1.1,1.2 StdAfx.cpp,1.1,1.2 Transcoder.cpp,1.2,1.3 Parser.dsp,1.15,NONE

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


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

Modified Files:
	GenParser.cpp MgaParser.cpp MgaParserBC.cpp MgaParserSC.cpp 
	Parser.def StdAfx.cpp Transcoder.cpp 
Added Files:
	Parser.vcproj 
Removed Files:
	Parser.dsp 
Log Message:
Checkin for VC7.1 upgrade


CVS User: zolmol

--- NEW FILE: Parser.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="Parser"
	SccProjectName=""
	SccLocalPath=""
	Keyword="AtlProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<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="../Common,../Include/STLport,../Include,../Interfaces"
				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
				StringPooling="TRUE"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="TRUE"
				UsePrecompiledHeader="3"
				PrecompiledHeaderThrough="stdafx.h"
				PrecompiledHeaderFile=".\Release/Parser.pch"
				AssemblerListingLocation=".\Release/"
				ObjectFile=".\Release/"
				ProgramDataBaseFileName=".\Release/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="3"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"
				Description="Performing registration"
				CommandLine="copy ..\Lib\xerces*.dll &quot;$(OutDir)&quot;
copy ..\Lib\xalan*.dll &quot;$(OutDir)&quot;
copy ..\Lib\harness*.dll &quot;$(OutDir)&quot;
copy *.dtd &quot;$(OutDir)&quot;
regsvr32 /s /c &quot;$(TargetPath)&quot;
echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
"
				Outputs="$(OutDir)\regsvr32.trg"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="odbc32.lib odbccp32.lib Harness_1.lib XalanMessages_1_7_0.lib Xalan-C_1.lib xerces-c_2.lib"
				OutputFile=".\Release/Parser.dll"
				LinkIncremental="1"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="../Lib"
				ModuleDefinitionFile=".\Parser.def"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\Release/Parser.pdb"
				GenerateMapFile="TRUE"
				MapFileName=".\Release/Parser.map"
				SubSystem="2"
				BaseAddress="0x61000000"
				ImportLibrary=".\Release/Parser.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName=".\Release/Parser.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>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\Debug"
			IntermediateDirectory=".\Debug"
			ConfigurationType="2"
			UseOfMFC="0"
			UseOfATL="2"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../Common,../Include/stlport,../Include,../Interfaces"
				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				UsePrecompiledHeader="3"
				PrecompiledHeaderThrough="stdafx.h"
				PrecompiledHeaderFile=".\Debug/Parser.pch"
				AssemblerListingLocation=".\Debug/"
				ObjectFile=".\Debug/"
				ProgramDataBaseFileName=".\Debug/"
				BrowseInformation="1"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="4"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"
				Description="Performing registration"
				CommandLine="copy ..\Lib\xerces*.dll &quot;$(OutDir)&quot;
copy ..\Lib\xalan*.dll &quot;$(OutDir)&quot;
copy ..\Lib\harness*.dll &quot;$(OutDir)&quot;
copy *.dtd &quot;$(OutDir)&quot;
regsvr32 /s /c &quot;$(TargetPath)&quot;
echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
"
				Outputs="$(OutDir)\regsvr32.trg"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="Harness_1D.lib XalanMessages_1_7_0D.lib Xalan-C_1D.lib xerces-c_2D.lib odbc32.lib odbccp32.lib"
				OutputFile=".\Debug/Parser.dll"
				LinkIncremental="2"
				SuppressStartupBanner="TRUE"
				AdditionalLibraryDirectories="../Lib"
				ModuleDefinitionFile=".\Parser.def"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\Debug/Parser.pdb"
				SubSystem="2"
				BaseAddress="0x61000000"
				ImportLibrary=".\Debug/Parser.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName=".\Debug/Parser.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>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
			<File
				RelativePath="dlldatax.c">
				<FileConfiguration
					Name="Release|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="GenParser.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Helper.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="MetaParser.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="MgaDumper.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="MgaParser.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="MgaParserBC.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="MgaParserClosureHelper.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="MgaParserSC.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="MgaXslt.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Parser.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Parser.def">
			</File>
			<File
				RelativePath="Parser.rc">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCResourceCompilerTool"
						PreprocessorDefinitions=""
						AdditionalIncludeDirectories="$(OUTDIR)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCResourceCompilerTool"
						PreprocessorDefinitions=""
						AdditionalIncludeDirectories="$(OUTDIR)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="ParserLib.idl">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCMIDLTool"
						AdditionalIncludeDirectories="..\Interfaces"
						GenerateStublessProxies="TRUE"
						TypeLibraryName=".\ParserLib.tlb"
						HeaderFileName="ParserLib.h"
						InterfaceIdentifierFileName="ParserLib_i.c"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCMIDLTool"
						AdditionalIncludeDirectories="..\Interfaces"
						GenerateStublessProxies="TRUE"
						TypeLibraryName=".\ParserLib.tlb"
						HeaderFileName="ParserLib.h"
						InterfaceIdentifierFileName="ParserLib_i.c"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="StdAfx.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"
						UsePrecompiledHeader="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						UsePrecompiledHeader="1"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Transcoder.cpp">
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;_ATL_DLL;$(NoInherit)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl">
			<File
				RelativePath="dlldatax.h">
				<FileConfiguration
					Name="Release|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCustomBuildTool"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug|Win32"
					ExcludedFromBuild="TRUE">
					<Tool
						Name="VCCustomBuildTool"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="GenParser.h">
			</File>
			<File
				RelativePath="Helper.h">
			</File>
			<File
				RelativePath="MetaParser.h">
			</File>
			<File
				RelativePath="MgaDumper.h">
			</File>
			<File
				RelativePath="MgaParser.h">
			</File>
			<File
				RelativePath="MgaXslt.h">
			</File>
			<File
				RelativePath="Resource.h">
			</File>
			<File
				RelativePath="StdAfx.h">
			</File>
			<File
				RelativePath="Transcoder.h">
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
			<File
				RelativePath="MetaParser.rgs">
			</File>
			<File
				RelativePath="MgaDumper.rgs">
			</File>
			<File
				RelativePath="MgaParser.rgs">
			</File>
			<File
				RelativePath="MgaXslt.rgs">
			</File>
		</Filter>
		<File
			RelativePath="edf.dtd">
		</File>
		<File
			RelativePath="mga.dtd">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

Index: GenParser.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/GenParser.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GenParser.cpp	13 Oct 2004 15:17:55 -0000	1.11
--- GenParser.cpp	26 Jan 2005 17:30:58 -0000	1.12
***************
*** 248,252 ****
  	long a = strtol(c, &e, 0);
  
! 	if( (e - c) != (int) s.length() )//zolmol!
  		HR_THROW(E_INVALID_XML_LONG);
  
--- 248,252 ----
  	long a = strtol(c, &e, 0);
  
! 	if( (e - c) != (int) s.length() )
  		HR_THROW(E_INVALID_XML_LONG);
  
***************
*** 261,265 ****
  	long a = strtoul(c, &e, 0);
  
! 	if( (e - c) != (int) s.length() )//zolmol!
  		HR_THROW(E_INVALID_XML_LONG);
  
--- 261,265 ----
  	long a = strtoul(c, &e, 0);
  
! 	if( (e - c) != (int) s.length() )
  		HR_THROW(E_INVALID_XML_LONG);
  

Index: MgaParser.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MgaParser.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** MgaParser.cpp	13 Oct 2004 15:17:55 -0000	1.27
--- MgaParser.cpp	26 Jan 2005 17:30:59 -0000	1.28
***************
*** 47,51 ****
  		CopyTo(filename, xmlfile);
  
! 		m_resolveDerFuncPtr = CMgaParser::ResolveDerivation; // zolmol
  		try
  		{
--- 47,51 ----
  		CopyTo(filename, xmlfile);
  
! 		m_resolveDerFuncPtr = CMgaParser::ResolveDerivation;
  		try
  		{
***************
*** 162,166 ****
  		CopyTo(filename, xmlfile);
  
! 		m_resolveDerFuncPtr = CMgaParser::ResolveDerivation; // zolmol
  		try
  		{
--- 162,166 ----
  		CopyTo(filename, xmlfile);
  
! 		m_resolveDerFuncPtr = CMgaParser::ResolveDerivation;
  		try
  		{
***************
*** 1146,1150 ****
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )//zolmol!
  		{
  			int pos2 = s->find_first_of(' ', pos);
--- 1146,1150 ----
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )
  		{
  			int pos2 = s->find_first_of(' ', pos);
***************
*** 1298,1302 ****
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )//zolmol!
  		{
  			int pos2 = s->find_first_of(' ', pos);
--- 1298,1302 ----
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )
  		{
  			int pos2 = s->find_first_of(' ', pos);

Index: MgaParserBC.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MgaParserBC.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MgaParserBC.cpp	13 Oct 2004 15:17:55 -0000	1.4
--- MgaParserBC.cpp	26 Jan 2005 17:30:59 -0000	1.5
***************
*** 359,363 ****
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )//zolmol!
  		{
  			int pos2 = s->find_first_of(' ', pos);
--- 359,363 ----
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )
  		{
  			int pos2 = s->find_first_of(' ', pos);
***************
*** 520,524 ****
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )//zolmol!
  		{
  			int pos2 = s->find_first_of(' ', pos);
--- 520,524 ----
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )
  		{
  			int pos2 = s->find_first_of(' ', pos);

Index: MgaParserSC.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/MgaParserSC.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MgaParserSC.cpp	13 Oct 2004 15:17:55 -0000	1.3
--- MgaParserSC.cpp	26 Jan 2005 17:30:59 -0000	1.4
***************
*** 413,417 ****
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )//zolmol!
  		{
  			int pos2 = s->find_first_of(' ', pos);
--- 413,417 ----
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )
  		{
  			int pos2 = s->find_first_of(' ', pos);
***************
*** 668,672 ****
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )//zolmol!
  		{
  			int pos2 = s->find_first_of(' ', pos);
--- 668,672 ----
  		int pos = s->find_first_not_of(' ', 0);
  		ASSERT( pos >= 0 );
! 		while( pos < (int) s->length() )
  		{
  			int pos2 = s->find_first_of(' ', pos);

Index: Parser.def
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/Parser.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Parser.def	5 Jul 2000 19:22:00 -0000	1.1
--- Parser.def	26 Jan 2005 17:30:59 -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: StdAfx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/StdAfx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.cpp	5 Jul 2000 19:22:00 -0000	1.1
--- StdAfx.cpp	26 Jan 2005 17:30:59 -0000	1.2
***************
*** 7,12 ****
  #ifdef _ATL_STATIC_REGISTRY
  #include <statreg.h>
- #include <statreg.cpp>
  #endif
- 
- #include <atlimpl.cpp>
--- 7,9 ----

Index: Transcoder.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Parser/Transcoder.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Transcoder.cpp	13 Oct 2004 15:17:55 -0000	1.2
--- Transcoder.cpp	26 Jan 2005 17:30:59 -0000	1.3
***************
*** 135,138 ****
                                    XMLFormatter* const formatter)
  {
! 	write( (const char * const)toWrite, count);//zolmol! cast from const unsigned char * const
  }
--- 135,139 ----
                                    XMLFormatter* const formatter)
  {
! 	ASSERT( sizeof( XMLByte) == sizeof( char));
! 	write( (const char * const)toWrite, count);//zolmol: cast from const unsigned char * const
  }

--- Parser.dsp DELETED ---



More information about the GME-commit mailing list