The projects/workspace files were somehow corrupted.

3 files changed, 74 insertions, 62 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
index a6f92a987cd..c7af72671d9 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "MT_Cubit Client"=.\client.dsp - Package Owner=<4>

+Project: "client"=".\client.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MT_Cubit Server"=.\server.dsp - Package Owner=<4>

+Project: "server"=".\server.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
index 9855a18f5f6..17d7390158a 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="MT_Cubit Client" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=MT_Cubit Client - Win32 Debug

+CFG=client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,27 +13,26 @@ CFG=MT_Cubit Client - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="MT_Cubit Client - Win32 Debug"

+!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MT_Cubit Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Cubit Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "MT_Cubit Client - Win32 Release"

+!IF  "$(CFG)" == "client - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Output_Dir "client__"

+# PROP BASE Intermediate_Dir "client__"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

@@ -42,8 +41,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /FD /I /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -51,14 +49,15 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

+# SUBTRACT LINK32 /map /debug /pdbtype:<none>

 

-!ELSEIF  "$(CFG)" == "MT_Cubit Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "client - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "client_0"

+# PROP BASE Intermediate_Dir "client_0"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -67,8 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /FD /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -76,14 +74,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcsd.lib aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "MT_Cubit Client - Win32 Release"

-# Name "MT_Cubit Client - Win32 Debug"

+# Name "client - Win32 Release"

+# Name "client - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -121,6 +119,10 @@ SOURCE=.\Timer.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\tmplinst.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Util_Thread.cpp

 # End Source File

 # End Group

@@ -133,6 +135,14 @@ SOURCE=.\client.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\cubit_i.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Cubit_Task.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\cubitC.h

 # End Source File

 # Begin Source File

@@ -141,10 +151,18 @@ SOURCE=.\cubitS.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Globals.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Task_Client.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Timer.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Util_Thread.h

 # End Source File

 # End Group

@@ -155,11 +173,10 @@ SOURCE=.\Util_Thread.h
 

 SOURCE=.\cubit.idl

 

-!IF  "$(CFG)" == "MT_Cubit Client - Win32 Release"

+!IF  "$(CFG)" == "client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

+# Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

 

@@ -194,11 +211,10 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "MT_Cubit Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "client - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

+# Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

 

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
index 85154a2381c..a4391619e47 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="MT_Cubit Server" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=MT_Cubit Server - Win32 Debug

+CFG=server - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,27 +13,26 @@ CFG=MT_Cubit Server - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="MT_Cubit Server - Win32 Debug"

+!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MT_Cubit Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Cubit Server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "MT_Cubit Server - Win32 Release"

+!IF  "$(CFG)" == "server - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Output_Dir "server__"

+# PROP BASE Intermediate_Dir "server__"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

@@ -42,8 +41,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /FD /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -51,14 +49,15 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

+# SUBTRACT LINK32 /map /debug /pdbtype:<none>

 

-!ELSEIF  "$(CFG)" == "MT_Cubit Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "server - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "server_0"

+# PROP BASE Intermediate_Dir "server_0"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -67,8 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /FD /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -76,14 +74,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcsd.lib aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "MT_Cubit Server - Win32 Release"

-# Name "MT_Cubit Server - Win32 Debug"

+# Name "server - Win32 Release"

+# Name "server - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -113,15 +111,11 @@ SOURCE=.\server.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Task_Client.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Timer.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Util_Thread.cpp

+SOURCE=.\tmplinst.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -133,6 +127,10 @@ SOURCE=.\cubit_i.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Cubit_Task.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\cubitC.h

 # End Source File

 # Begin Source File

@@ -141,15 +139,15 @@ SOURCE=.\cubitS.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\server.h

+SOURCE=.\Globals.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Task_Client.h

+SOURCE=.\server.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Util_Thread.h

+SOURCE=.\Timer.h

 # End Source File

 # End Group

 # Begin Group "IDL Files"

@@ -159,11 +157,10 @@ SOURCE=.\Util_Thread.h
 

 SOURCE=.\cubit.idl

 

-!IF  "$(CFG)" == "MT_Cubit Server - Win32 Release"

+!IF  "$(CFG)" == "server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

+# Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

 

@@ -198,11 +195,10 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "MT_Cubit Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "server - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

+# Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit