ChangeLogTag: Fri Jan 9 14:46:41 2004 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 516 insertions, 471 deletions

diff --git a/TAO/CIAO/CCF/CCF/CIDL/CIDL.vcproj b/TAO/CIAO/CCF/CCF/CIDL/CIDL.vcproj
index 4c1e0e297f3..6c2fb06fa76 100644
--- a/TAO/CIAO/CCF/CCF/CIDL/CIDL.vcproj
+++ b/TAO/CIAO/CCF/CCF/CIDL/CIDL.vcproj
@@ -1,315 +1,315 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="CIDL"

-	ProjectGUID="{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ProjectDir)"

-			IntermediateDirectory="$(ProjectDir)/Debug"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"

-				Optimization="0"

-				AdditionalIncludeDirectories="../.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				DisableLanguageExtensions="FALSE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/CIDL.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ProjectDir)"

-			IntermediateDirectory="$(ProjectDir)/Release"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"

-				AdditionalIncludeDirectories="../.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				RuntimeLibrary="4"

-				DisableLanguageExtensions="FALSE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/CIDL.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath=".\LexicalAnalyzer.cpp">

-			</File>

-			<File

-				RelativePath=".\Parser.cpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<File

-				RelativePath=".\LexicalAnalyzer.hpp">

-			</File>

-			<File

-				RelativePath=".\Parser.hpp">

-			</File>

-			<File

-				RelativePath=".\SemanticAction.hpp">

-			</File>

-			<File

-				RelativePath=".\SemanticGraph.hpp">

-			</File>

-			<File

-				RelativePath=".\Token.hpp">

-			</File>

-			<File

-				RelativePath=".\Traversal.hpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="SemanticAction"

-			Filter="">

-			<Filter

-				Name="Source Files"

-				Filter="">

-				<File

-					RelativePath=".\SemanticAction\Composition.cpp">

-				</File>

-			</Filter>

-			<Filter

-				Name="Header Files"

-				Filter="">

-				<File

-					RelativePath=".\SemanticAction\Composition.hpp">

-				</File>

-				<File

-					RelativePath=".\SemanticAction\Elements.hpp">

-				</File>

-				<File

-					RelativePath=".\SemanticAction\Factory.hpp">

-				</File>

-				<File

-					RelativePath=".\SemanticAction\HomeExecutor.hpp">

-				</File>

-			</Filter>

-			<Filter

-				Name="Impl"

-				Filter="">

-				<Filter

-					Name="Source Files"

-					Filter="">

-					<File

-						RelativePath=".\SemanticAction\Impl\Composition.cpp">

-						<FileConfiguration

-							Name="Debug|Win32">

-							<Tool

-								Name="VCCLCompilerTool"

-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>

-						</FileConfiguration>

-						<FileConfiguration

-							Name="Release|Win32">

-							<Tool

-								Name="VCCLCompilerTool"

-								ObjectFile="$(IntDir)/$(InputName)1.obj"/>

-						</FileConfiguration>

-					</File>

-					<File

-						RelativePath=".\SemanticAction\Impl\Factory.cpp">

-					</File>

-					<File

-						RelativePath=".\SemanticAction\Impl\HomeExecutor.cpp">

-					</File>

-				</Filter>

-				<Filter

-					Name="Header Files"

-					Filter="">

-					<File

-						RelativePath=".\SemanticAction\Impl\Composition.hpp">

-					</File>

-					<File

-						RelativePath=".\SemanticAction\Impl\Elements.hpp">

-					</File>

-					<File

-						RelativePath=".\SemanticAction\Impl\Factory.hpp">

-					</File>

-					<File

-						RelativePath=".\SemanticAction\Impl\HomeExecutor.hpp">

-					</File>

-				</Filter>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="SemanticGraph"

-			Filter="">

-			<Filter

-				Name="Source Files"

-				Filter="">

-				<File

-					RelativePath=".\SemanticGraph\Composition.cpp">

-					<FileConfiguration

-						Name="Debug|Win32">

-						<Tool

-							Name="VCCLCompilerTool"

-							ObjectFile="$(IntDir)/$(InputName)2.obj"/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|Win32">

-						<Tool

-							Name="VCCLCompilerTool"

-							ObjectFile="$(IntDir)/$(InputName)2.obj"/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath=".\SemanticGraph\Elements.cpp">

-				</File>

-				<File

-					RelativePath=".\SemanticGraph\Executor.cpp">

-				</File>

-			</Filter>

-			<Filter

-				Name="Header Files"

-				Filter="">

-				<File

-					RelativePath=".\SemanticGraph\Composition.hpp">

-				</File>

-				<File

-					RelativePath=".\SemanticGraph\Elements.hpp">

-				</File>

-				<File

-					RelativePath=".\SemanticGraph\Executor.hpp">

-				</File>

-			</Filter>

-		</Filter>

-		<Filter

-			Name="Traversal"

-			Filter="">

-			<Filter

-				Name="Source Files"

-				Filter="">

-				<File

-					RelativePath=".\Traversal\Elements.cpp">

-					<FileConfiguration

-						Name="Debug|Win32">

-						<Tool

-							Name="VCCLCompilerTool"

-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|Win32">

-						<Tool

-							Name="VCCLCompilerTool"

-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>

-					</FileConfiguration>

-				</File>

-				<File

-					RelativePath=".\Traversal\Executor.cpp">

-					<FileConfiguration

-						Name="Debug|Win32">

-						<Tool

-							Name="VCCLCompilerTool"

-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>

-					</FileConfiguration>

-					<FileConfiguration

-						Name="Release|Win32">

-						<Tool

-							Name="VCCLCompilerTool"

-							ObjectFile="$(IntDir)/$(InputName)1.obj"/>

-					</FileConfiguration>

-				</File>

-			</Filter>

-			<Filter

-				Name="Header Files"

-				Filter="">

-				<File

-					RelativePath=".\Traversal\Composition.hpp">

-				</File>

-				<File

-					RelativePath=".\Traversal\Elements.hpp">

-				</File>

-				<File

-					RelativePath=".\Traversal\Executor.hpp">

-				</File>

-			</Filter>

-			<Filter

-				Name="Template Files"

-				Filter="">

-				<File

-					RelativePath=".\Traversal\Composition.tpp">

-				</File>

-			</Filter>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="CIDL"
+	ProjectGUID="{ADCB8816-C2B5-46AE-AC73-0A2FE72386D6}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ProjectDir)"
+			IntermediateDirectory="$(ProjectDir)/Debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"
+				Optimization="0"
+				AdditionalIncludeDirectories="../.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				DisableLanguageExtensions="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/CIDL.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectDir)"
+			IntermediateDirectory="$(ProjectDir)/Release"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4290 /wd4800 /wd4250 /wd4355"
+				AdditionalIncludeDirectories="../.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="4"
+				DisableLanguageExtensions="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/CIDL.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\LexicalAnalyzer.cpp">
+			</File>
+			<File
+				RelativePath=".\Parser.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\LexicalAnalyzer.hpp">
+			</File>
+			<File
+				RelativePath=".\Parser.hpp">
+			</File>
+			<File
+				RelativePath=".\SemanticAction.hpp">
+			</File>
+			<File
+				RelativePath=".\SemanticGraph.hpp">
+			</File>
+			<File
+				RelativePath=".\Token.hpp">
+			</File>
+			<File
+				RelativePath=".\Traversal.hpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="SemanticAction"
+			Filter="">
+			<Filter
+				Name="Source Files"
+				Filter="">
+				<File
+					RelativePath=".\SemanticAction\Composition.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				Filter="">
+				<File
+					RelativePath=".\SemanticAction\Composition.hpp">
+				</File>
+				<File
+					RelativePath=".\SemanticAction\Elements.hpp">
+				</File>
+				<File
+					RelativePath=".\SemanticAction\Factory.hpp">
+				</File>
+				<File
+					RelativePath=".\SemanticAction\HomeExecutor.hpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Impl"
+				Filter="">
+				<Filter
+					Name="Source Files"
+					Filter="">
+					<File
+						RelativePath=".\SemanticAction\Impl\Composition.cpp">
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\SemanticAction\Impl\Factory.cpp">
+					</File>
+					<File
+						RelativePath=".\SemanticAction\Impl\HomeExecutor.cpp">
+					</File>
+				</Filter>
+				<Filter
+					Name="Header Files"
+					Filter="">
+					<File
+						RelativePath=".\SemanticAction\Impl\Composition.hpp">
+					</File>
+					<File
+						RelativePath=".\SemanticAction\Impl\Elements.hpp">
+					</File>
+					<File
+						RelativePath=".\SemanticAction\Impl\Factory.hpp">
+					</File>
+					<File
+						RelativePath=".\SemanticAction\Impl\HomeExecutor.hpp">
+					</File>
+				</Filter>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="SemanticGraph"
+			Filter="">
+			<Filter
+				Name="Source Files"
+				Filter="">
+				<File
+					RelativePath=".\SemanticGraph\Composition.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\SemanticGraph\Elements.cpp">
+				</File>
+				<File
+					RelativePath=".\SemanticGraph\Executor.cpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				Filter="">
+				<File
+					RelativePath=".\SemanticGraph\Composition.hpp">
+				</File>
+				<File
+					RelativePath=".\SemanticGraph\Elements.hpp">
+				</File>
+				<File
+					RelativePath=".\SemanticGraph\Executor.hpp">
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Traversal"
+			Filter="">
+			<Filter
+				Name="Source Files"
+				Filter="">
+				<File
+					RelativePath=".\Traversal\Elements.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath=".\Traversal\Executor.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				Filter="">
+				<File
+					RelativePath=".\Traversal\Composition.hpp">
+				</File>
+				<File
+					RelativePath=".\Traversal\Elements.hpp">
+				</File>
+				<File
+					RelativePath=".\Traversal\Executor.hpp">
+				</File>
+			</Filter>
+			<Filter
+				Name="Template Files"
+				Filter="">
+				<File
+					RelativePath=".\Traversal\Composition.tpp">
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj
index d7024e79590..ef8acbb50d4 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/CodeGenerationKit.vcproj
@@ -1,156 +1,156 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="CodeGenerationKit"

-	ProjectGUID="{5F0B01BD-722F-4958-8E02-680588866D7C}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ProjectDir)"

-			IntermediateDirectory="$(ProjectDir)/Debug"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				DisableLanguageExtensions="FALSE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/CodeGenerationKit.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(ProjectDir)"

-			IntermediateDirectory="$(ProjectDir)/Release"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				RuntimeLibrary="4"

-				DisableLanguageExtensions="FALSE"

-				ForceConformanceInForLoopScope="TRUE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="FALSE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/CodeGenerationKit.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath=".\CommandLine.cpp">

-			</File>

-			<File

-				RelativePath=".\CommandLineGrammar.cpp">

-			</File>

-			<File

-				RelativePath=".\CommandLineParser.cpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<File

-				RelativePath=".\CommandLine.hpp">

-			</File>

-			<File

-				RelativePath=".\CommandLineDescriptor.hpp">

-			</File>

-			<File

-				RelativePath=".\CommandLineGrammar.hpp">

-			</File>

-			<File

-				RelativePath=".\CommandLineParser.hpp">

-			</File>

-			<File

-				RelativePath=".\IndentationBuffer.hpp">

-			</File>

-			<File

-				RelativePath=".\IndentationCxx.hpp">

-			</File>

-			<File

-				RelativePath=".\IndentationIDL.hpp">

-			</File>

-			<File

-				RelativePath=".\IndentationImplanter.hpp">

-			</File>

-			<File

-				RelativePath=".\IndentationXML.hpp">

-			</File>

-			<File

-				RelativePath=".\Regex.hpp">

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="CodeGenerationKit"
+	ProjectGUID="{5F0B01BD-722F-4958-8E02-680588866D7C}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ProjectDir)"
+			IntermediateDirectory="$(ProjectDir)/Debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../.."
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				DisableLanguageExtensions="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/CodeGenerationKit.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ProjectDir)"
+			IntermediateDirectory="$(ProjectDir)/Release"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../.."
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="4"
+				DisableLanguageExtensions="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/CodeGenerationKit.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\CommandLine.cpp">
+			</File>
+			<File
+				RelativePath=".\CommandLineGrammar.cpp">
+			</File>
+			<File
+				RelativePath=".\CommandLineParser.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\CommandLine.hpp">
+			</File>
+			<File
+				RelativePath=".\CommandLineDescriptor.hpp">
+			</File>
+			<File
+				RelativePath=".\CommandLineGrammar.hpp">
+			</File>
+			<File
+				RelativePath=".\CommandLineParser.hpp">
+			</File>
+			<File
+				RelativePath=".\IndentationBuffer.hpp">
+			</File>
+			<File
+				RelativePath=".\IndentationCxx.hpp">
+			</File>
+			<File
+				RelativePath=".\IndentationIDL.hpp">
+			</File>
+			<File
+				RelativePath=".\IndentationImplanter.hpp">
+			</File>
+			<File
+				RelativePath=".\IndentationXML.hpp">
+			</File>
+			<File
+				RelativePath=".\Regex.hpp">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj b/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj
index 9ec724a3820..8b0d7c39970 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj
+++ b/TAO/CIAO/CCF/CCF/IDL2/IDL2.vcproj
@@ -219,6 +219,9 @@
 					RelativePath=".\SemanticGraph\TypeId.cpp">
 				</File>
 				<File
+					RelativePath=".\SemanticGraph\Union.cpp">
+				</File>
+				<File
 					RelativePath=".\SemanticGraph\ValueType.cpp">
 				</File>
 			</Filter>
@@ -277,6 +280,9 @@
 					RelativePath=".\SemanticGraph\TypeId.hpp">
 				</File>
 				<File
+					RelativePath=".\SemanticGraph\Union.hpp">
+				</File>
+				<File
 					RelativePath=".\SemanticGraph\ValueType.hpp">
 				</File>
 			</Filter>
@@ -536,6 +542,21 @@
 					</FileConfiguration>
 				</File>
 				<File
+					RelativePath=".\Traversal\Union.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+					</FileConfiguration>
+				</File>
+				<File
 					RelativePath=".\Traversal\ValueType.cpp">
 					<FileConfiguration
 						Name="Debug|Win32">
@@ -597,6 +618,9 @@
 					RelativePath=".\Traversal\TypeId.hpp">
 				</File>
 				<File
+					RelativePath=".\Traversal\Union.hpp">
+				</File>
+				<File
 					RelativePath=".\Traversal\ValueType.hpp">
 				</File>
 			</Filter>
@@ -679,6 +703,9 @@
 					RelativePath=".\SemanticAction\TypeId.hpp">
 				</File>
 				<File
+					RelativePath=".\SemanticAction\Union.hpp">
+				</File>
+				<File
 					RelativePath=".\SemanticAction\ValueType.hpp">
 				</File>
 			</Filter>
@@ -839,6 +866,21 @@
 						</FileConfiguration>
 					</File>
 					<File
+						RelativePath=".\SemanticAction\Impl\Union.cpp">
+						<FileConfiguration
+							Name="Debug|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)2.obj"/>
+						</FileConfiguration>
+					</File>
+					<File
 						RelativePath=".\SemanticAction\Impl\ValueType.cpp">
 						<FileConfiguration
 							Name="Debug|Win32">
@@ -900,6 +942,9 @@
 						RelativePath=".\SemanticAction\Impl\TypeId.hpp">
 					</File>
 					<File
+						RelativePath=".\SemanticAction\Impl\Union.hpp">
+					</File>
+					<File
 						RelativePath=".\SemanticAction\Impl\ValueType.hpp">
 					</File>
 				</Filter>