summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/Atomic_Op_Test.dsp303
-rw-r--r--tests/Barrier_Test.dsp341
-rw-r--r--tests/Buffer_Stream_Test.dsp434
-rw-r--r--tests/Conn_Test.dsp504
-rw-r--r--tests/Enum_Interfaces_Test.dsp282
-rw-r--r--tests/Future_Test.dsp435
-rw-r--r--tests/Handle_Set_Test.dsp351
-rw-r--r--tests/Hash_Map_Manager_Test.dsp371
-rw-r--r--tests/IOStream_Test.dsp491
-rw-r--r--tests/MM_Shared_Memory_Test.dsp346
-rw-r--r--tests/MT_SOCK_Test.dsp379
-rw-r--r--tests/Map_Manager_Test.dsp391
-rw-r--r--tests/Mem_Map_Test.dsp279
-rw-r--r--tests/Message_Block_Test.dsp436
-rw-r--r--tests/Message_Queue_Notifications_Test.dsp430
-rw-r--r--tests/Message_Queue_Test.dsp404
-rw-r--r--tests/Naming_Test.dsp417
-rw-r--r--tests/Notify_Performance_Test.dsp440
-rw-r--r--tests/Pipe_Test.dsp286
-rw-r--r--tests/Priority_Buffer_Test.dsp406
-rw-r--r--tests/Priority_Reactor_Test.dsp520
-rw-r--r--tests/Priority_Task_Test.dsp430
-rw-r--r--tests/Process_Mutex_Test.dsp310
-rw-r--r--tests/Process_Strategy_Test.dsp488
-rw-r--r--tests/Reactor_Exceptions_Test.dsp378
-rw-r--r--tests/Reactor_Notify_Test.dsp430
-rw-r--r--tests/Reactor_Performance_Test.dsp524
-rw-r--r--tests/Reactor_Timer_Test.dsp354
-rw-r--r--tests/Reactors_Test.dsp427
-rw-r--r--tests/Reader_Writer_Test.dsp344
-rw-r--r--tests/Recursive_Mutex_Test.dsp344
-rw-r--r--tests/SOCK_Connector_Test.dsp78
-rw-r--r--tests/SOCK_Test.dsp378
-rw-r--r--tests/SPIPE_Test.dsp367
-rw-r--r--tests/SString_Test.dsp275
-rw-r--r--tests/SV_Shared_Memory_Test.dsp336
-rw-r--r--tests/Semaphore_Test.dsp345
-rw-r--r--tests/Service_Config_Test.dsp368
-rw-r--r--tests/Sigset_Ops_Test.dsp275
-rw-r--r--tests/Simple_Message_Block_Test.dsp340
-rw-r--r--tests/TSS_Test.dsp342
-rw-r--r--tests/Task_Test.dsp426
-rw-r--r--tests/Thread_Manager_Test.dsp342
-rw-r--r--tests/Thread_Pool_Test.dsp427
-rw-r--r--tests/Time_Service_Test.dsp279
-rw-r--r--tests/Time_Value_Test.dsp275
-rw-r--r--tests/Timer_Queue_Test.dsp217
-rw-r--r--tests/Tokens_Test.dsp439
-rw-r--r--tests/UPIPE_SAP_Test.dsp471
-rw-r--r--tests/tests.dsw12
50 files changed, 282 insertions, 17985 deletions
diff --git a/tests/Atomic_Op_Test.dsp b/tests/Atomic_Op_Test.dsp
index 93a60e21f85..5e9ffb008e7 100644
--- a/tests/Atomic_Op_Test.dsp
+++ b/tests/Atomic_Op_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Atomic_Op_Test - Win32 Alpha Unicode Release
+CFG=Atomic_Op_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Atomic_Op_Test - Win32 Alpha Unicode Release
!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 "Atomic_Op_Test.mak"\
- CFG="Atomic_Op_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Atomic_Op_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Atomic_Op_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Atomic_Op_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_O"
-# PROP BASE Intermediate_Dir "Atomic_O"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_0"
-# PROP BASE Intermediate_Dir "Atomic_0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_O"
-# PROP BASE Intermediate_Dir "Atomic_O"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_O"
-# PROP BASE Intermediate_Dir "Atomic_O"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_0"
-# PROP BASE Intermediate_Dir "Atomic_0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Atomic_1"
-# PROP BASE Intermediate_Dir "Atomic_1"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Atomic_Op_Test - Win32 Debug"
# Name "Atomic_Op_Test - Win32 Alpha Debug"
-# Name "Atomic_Op_Test - Win32 Release"
-# Name "Atomic_Op_Test - Win32 Unicode Debug"
-# Name "Atomic_Op_Test - Win32 Unicode Release"
-# Name "Atomic_Op_Test - Win32 Alpha Release"
-# Name "Atomic_Op_Test - Win32 Alpha Unicode Debug"
-# Name "Atomic_Op_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter ".cpp"
@@ -340,104 +143,6 @@ DEP_CPP_ATOMI=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_ATOMI=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Atomic_Op_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_ATOMI=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Barrier_Test.dsp b/tests/Barrier_Test.dsp
index 58b3bc4ceb0..f46134c0241 100644
--- a/tests/Barrier_Test.dsp
+++ b/tests/Barrier_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Barrier_Test - Win32 Alpha Unicode Release
+CFG=Barrier_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Barrier_Test - Win32 Alpha Unicode Release
!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 "Barrier_Test.mak"\
- CFG="Barrier_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Barrier_Test.mak" CFG="Barrier_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Barrier_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Barrier_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Barrier_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Barrier_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Barrier_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Barrier_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Barrier_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Barrier_Test\Debug"
-# PROP BASE Intermediate_Dir "Barrier_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Barrier_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Barrier_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Barrier_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Barrier_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Barrier_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Barrier_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Barrier_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Barrier_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Barrier_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Barrier_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Barrier_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Barrier_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Barrier_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Barrier_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Barrier_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Barrier_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Barrier_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Barrier_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Barrier_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Barrier_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Barrier_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Barrier_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Barrier_Test - Win32 Debug"
# Name "Barrier_Test - Win32 Alpha Debug"
-# Name "Barrier_Test - Win32 Release"
-# Name "Barrier_Test - Win32 Unicode Debug"
-# Name "Barrier_Test - Win32 Unicode Release"
-# Name "Barrier_Test - Win32 Alpha Release"
-# Name "Barrier_Test - Win32 Alpha Unicode Debug"
-# Name "Barrier_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -359,142 +162,6 @@ DEP_CPP_BARRI=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_BARRI=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Barrier_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_BARRI=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Buffer_Stream_Test.dsp b/tests/Buffer_Stream_Test.dsp
index 8db6c349246..a32aba99f98 100644
--- a/tests/Buffer_Stream_Test.dsp
+++ b/tests/Buffer_Stream_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Buffer_Stream_Test - Win32 Alpha Unicode Release
+CFG=Buffer_Stream_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Buffer_Stream_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Buffer_Stream_Test.mak"\
- CFG="Buffer_Stream_Test - Win32 Alpha Unicode Release"
+ CFG="Buffer_Stream_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Buffer_Stream_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Buffer_Stream_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Buffer_Stream_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Buffer_Stream_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Buffer_Stream_Test\Debug"
-# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Buffer_Stream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Buffer_Stream_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Buffer_Stream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Buffer_Stream_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Buffer_Stream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Buffer_Stream_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Buffer_Stream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Buffer_Stream_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Buffer_Stream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Buffer_Stream_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Buffer_Stream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Buffer_Stream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Buffer_Stream_Test - Win32 Debug"
# Name "Buffer_Stream_Test - Win32 Alpha Debug"
-# Name "Buffer_Stream_Test - Win32 Release"
-# Name "Buffer_Stream_Test - Win32 Unicode Debug"
-# Name "Buffer_Stream_Test - Win32 Unicode Release"
-# Name "Buffer_Stream_Test - Win32 Alpha Release"
-# Name "Buffer_Stream_Test - Win32 Alpha Unicode Debug"
-# Name "Buffer_Stream_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -406,236 +210,6 @@ DEP_CPP_BUFFE=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_BUFFE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream.cpp"\
- "..\ace\Stream.h"\
- "..\ace\Stream.i"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Buffer_Stream_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_BUFFE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream.cpp"\
- "..\ace\Stream.h"\
- "..\ace\Stream.i"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Conn_Test.dsp b/tests/Conn_Test.dsp
index da7dc42fbba..109b590f1d5 100644
--- a/tests/Conn_Test.dsp
+++ b/tests/Conn_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Conn_Test - Win32 Alpha Unicode Release
+CFG=Conn_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,25 +14,13 @@ CFG=Conn_Test - Win32 Alpha Unicode Release
!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 "Conn_Test.mak" CFG="Conn_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Conn_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "Conn_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Conn_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Conn_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Conn_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Conn_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -81,8 +69,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Conn_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -94,196 +82,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Conn_Test\Debug"
-# PROP BASE Intermediate_Dir "Conn_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Conn_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Conn_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Conn_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Conn_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Conn_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Conn_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Conn_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Conn_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Conn_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Conn_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Conn_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Conn_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Conn_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Conn_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Conn_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Conn_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Conn_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Conn_Test - Win32 Debug"
# Name "Conn_Test - Win32 Alpha Debug"
-# Name "Conn_Test - Win32 Release"
-# Name "Conn_Test - Win32 Unicode Debug"
-# Name "Conn_Test - Win32 Unicode Release"
-# Name "Conn_Test - Win32 Alpha Release"
-# Name "Conn_Test - Win32 Alpha Unicode Debug"
-# Name "Conn_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -434,306 +238,6 @@ DEP_CPP_CONN_=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_CONN_=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Connector.cpp"\
- "..\ace\Connector.h"\
- "..\ace\Connector.i"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\LOCK_SOCK_Acceptor.cpp"\
- "..\ace\LOCK_SOCK_Acceptor.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\Conn_Test.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Conn_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_CONN_=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Connector.cpp"\
- "..\ace\Connector.h"\
- "..\ace\Connector.i"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\LOCK_SOCK_Acceptor.cpp"\
- "..\ace\LOCK_SOCK_Acceptor.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\Conn_Test.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Enum_Interfaces_Test.dsp b/tests/Enum_Interfaces_Test.dsp
index c25cd53c389..c1476d05be6 100644
--- a/tests/Enum_Interfaces_Test.dsp
+++ b/tests/Enum_Interfaces_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Enum_Interfaces_Test - Win32 Alpha Unicode Release
+CFG=Enum_Interfaces_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Enum_Interfaces_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak"\
- CFG="Enum_Interfaces_Test - Win32 Alpha Unicode Release"
+ CFG="Enum_Interfaces_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Enum_Interfaces_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Enum_Int"
-# PROP BASE Intermediate_Dir "Enum_Int"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Enum_In0"
-# PROP BASE Intermediate_Dir "Enum_In0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Enum_Int"
-# PROP BASE Intermediate_Dir "Enum_Int"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Enum_Int"
-# PROP BASE Intermediate_Dir "Enum_Int"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Enum_In0"
-# PROP BASE Intermediate_Dir "Enum_In0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Enum_In1"
-# PROP BASE Intermediate_Dir "Enum_In1"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Enum_Interfaces_Test - Win32 Debug"
# Name "Enum_Interfaces_Test - Win32 Alpha Debug"
-# Name "Enum_Interfaces_Test - Win32 Release"
-# Name "Enum_Interfaces_Test - Win32 Unicode Debug"
-# Name "Enum_Interfaces_Test - Win32 Unicode Release"
-# Name "Enum_Interfaces_Test - Win32 Alpha Release"
-# Name "Enum_Interfaces_Test - Win32 Alpha Unicode Debug"
-# Name "Enum_Interfaces_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -330,84 +134,6 @@ DEP_CPP_ENUM_=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_ENUM_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Enum_Interfaces_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_ENUM_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Future_Test.dsp b/tests/Future_Test.dsp
index 0bec6753880..f5673dc9e12 100644
--- a/tests/Future_Test.dsp
+++ b/tests/Future_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Future_Test - Win32 Alpha Unicode Release
+CFG=Future_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Future_Test - Win32 Alpha Unicode Release
!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 "Future_Test.mak"\
- CFG="Future_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Future_Test.mak" CFG="Future_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Future_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Future_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Future_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Future_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Future_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Future_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Future_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Future_Test\Debug"
-# PROP BASE Intermediate_Dir "Future_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Future_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Future_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Future_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Future_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Future_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Future_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Future_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Future_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Future_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Future_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Future_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Future_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Future_Test - Win32 Debug"
# Name "Future_Test - Win32 Alpha Debug"
-# Name "Future_Test - Win32 Release"
-# Name "Future_Test - Win32 Unicode Debug"
-# Name "Future_Test - Win32 Unicode Release"
-# Name "Future_Test - Win32 Alpha Release"
-# Name "Future_Test - Win32 Alpha Unicode Debug"
-# Name "Future_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -406,236 +209,6 @@ DEP_CPP_FUTUR=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_FUTUR=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Activation_Queue.h"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Future.cpp"\
- "..\ace\Future.h"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Method_Object.h"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Future_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_FUTUR=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Activation_Queue.h"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Future.cpp"\
- "..\ace\Future.h"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Method_Object.h"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Handle_Set_Test.dsp b/tests/Handle_Set_Test.dsp
index c0432c4935d..1734a2a42e7 100644
--- a/tests/Handle_Set_Test.dsp
+++ b/tests/Handle_Set_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Handle_Set_Test - Win32 Alpha Unicode Release
+CFG=Handle_Set_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Handle_Set_Test - Win32 Alpha Unicode Release
!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 "Handle_Set_Test.mak"\
- CFG="Handle_Set_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Handle_Set_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Handle_Set_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Handle_Set_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Handle_Set_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Handle_Set_Test\Debug"
-# PROP BASE Intermediate_Dir "Handle_Set_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Handle_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Handle_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Handle_Set_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Handle_Set_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Handle_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Handle_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Handle_Set_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Handle_Set_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Handle_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Handle_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Handle_Set_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Handle_Set_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Handle_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Handle_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Handle_Set_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Handle_Set_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Handle_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Handle_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Handle_Set_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Handle_Set_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Handle_Set_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Handle_Set_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Handle_Set_Test - Win32 Debug"
# Name "Handle_Set_Test - Win32 Alpha Debug"
-# Name "Handle_Set_Test - Win32 Release"
-# Name "Handle_Set_Test - Win32 Unicode Debug"
-# Name "Handle_Set_Test - Win32 Unicode Release"
-# Name "Handle_Set_Test - Win32 Alpha Release"
-# Name "Handle_Set_Test - Win32 Alpha Unicode Debug"
-# Name "Handle_Set_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -364,152 +167,6 @@ DEP_CPP_HANDL=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_HANDL=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Handle_Set_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_HANDL=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Hash_Map_Manager_Test.dsp b/tests/Hash_Map_Manager_Test.dsp
index 5707a7dd200..c2a208dcfb4 100644
--- a/tests/Hash_Map_Manager_Test.dsp
+++ b/tests/Hash_Map_Manager_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Hash_Map_Manager_Test - Win32 Alpha Unicode Release
+CFG=Hash_Map_Manager_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Hash_Map_Manager_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak"\
- CFG="Hash_Map_Manager_Test - Win32 Alpha Unicode Release"
+ CFG="Hash_Map_Manager_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Hash_Map_Manager_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,193 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Hash_Map"
-# PROP BASE Intermediate_Dir "Hash_Map"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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:IX86 /pdbtype:sept /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /incremental:no
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:IX86 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Hash_Ma0"
-# PROP BASE Intermediate_Dir "Hash_Ma0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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:IX86 /pdbtype:sept /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /incremental:no
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
-# SUBTRACT LINK32 /incremental:no
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Hash_Map"
-# PROP BASE Intermediate_Dir "Hash_Map"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:IX86 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:IX86 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Hash_Map"
-# PROP BASE Intermediate_Dir "Hash_Map"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "NDEBUG" /YX /FD /c
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "NDEBUG" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Hash_Ma0"
-# PROP BASE Intermediate_Dir "Hash_Ma0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Hash_Ma1"
-# PROP BASE Intermediate_Dir "Hash_Ma1"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /YX /FD /c
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Hash_Map_Manager_Test - Win32 Debug"
# Name "Hash_Map_Manager_Test - Win32 Alpha Debug"
-# Name "Hash_Map_Manager_Test - Win32 Release"
-# Name "Hash_Map_Manager_Test - Win32 Unicode Debug"
-# Name "Hash_Map_Manager_Test - Win32 Unicode Release"
-# Name "Hash_Map_Manager_Test - Win32 Alpha Release"
-# Name "Hash_Map_Manager_Test - Win32 Alpha Unicode Debug"
-# Name "Hash_Map_Manager_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -373,176 +180,6 @@ DEP_CPP_HASH_=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_HASH_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\Hash_Map_Manager_Test.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Hash_Map_Manager_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_HASH_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\Hash_Map_Manager_Test.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/IOStream_Test.dsp b/tests/IOStream_Test.dsp
index ecc8cb54510..f5b7fd9b56c 100644
--- a/tests/IOStream_Test.dsp
+++ b/tests/IOStream_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=IOStream_Test - Win32 Alpha Unicode Release
+CFG=IOStream_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=IOStream_Test - Win32 Alpha Unicode Release
!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 "IOStream_Test.mak"\
- CFG="IOStream_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "IOStream_Test.mak" CFG="IOStream_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=IOStream_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "IOStream_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "IOStream_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "IOStream_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "IOStream_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "IOStream_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "IOStream_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "IOStream_Test\Debug"
-# PROP BASE Intermediate_Dir "IOStream_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "IOStream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "IOStream_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "IOStream_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "IOStream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "IOStream_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "IOStream_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "IOStream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "IOStream_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "IOStream_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "IOStream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "IOStream_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "IOStream_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "IOStream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "IOStream_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "IOStream_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "IOStream_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "IOStream_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "IOStream_Test - Win32 Debug"
# Name "IOStream_Test - Win32 Alpha Debug"
-# Name "IOStream_Test - Win32 Release"
-# Name "IOStream_Test - Win32 Unicode Debug"
-# Name "IOStream_Test - Win32 Unicode Release"
-# Name "IOStream_Test - Win32 Alpha Release"
-# Name "IOStream_Test - Win32 Alpha Unicode Debug"
-# Name "IOStream_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -431,292 +234,6 @@ DEP_CPP_IOSTR=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_IOSTR=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IOStream.h"\
- "..\ace\IOStream_T.cpp"\
- "..\ace\IOStream_T.h"\
- "..\ace\IOStream_T.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "IOStream_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_IOSTR=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IOStream.h"\
- "..\ace\IOStream_T.cpp"\
- "..\ace\IOStream_T.h"\
- "..\ace\IOStream_T.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/MM_Shared_Memory_Test.dsp b/tests/MM_Shared_Memory_Test.dsp
index c8dc96b7fb6..19ff137a4ff 100644
--- a/tests/MM_Shared_Memory_Test.dsp
+++ b/tests/MM_Shared_Memory_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=MM_Shared_Memory_Test - Win32 Alpha Unicode Release
+CFG=MM_Shared_Memory_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=MM_Shared_Memory_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "MM_Shared_Memory_Test.mak"\
- CFG="MM_Shared_Memory_Test - Win32 Alpha Unicode Release"
+ CFG="MM_Shared_Memory_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=MM_Shared_Memory_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "MM_Shared_Memory_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MM_Shared_Memory_Test\Debug"
-# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "MM_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MM_Shared_Memory_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "MM_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MM_Shared_Memory_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "MM_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MM_Shared_Memory_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "MM_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MM_Shared_Memory_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "MM_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MM_Shared_Memory_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "MM_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "MM_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "MM_Shared_Memory_Test - Win32 Debug"
# Name "MM_Shared_Memory_Test - Win32 Alpha Debug"
-# Name "MM_Shared_Memory_Test - Win32 Release"
-# Name "MM_Shared_Memory_Test - Win32 Unicode Debug"
-# Name "MM_Shared_Memory_Test - Win32 Unicode Release"
-# Name "MM_Shared_Memory_Test - Win32 Alpha Release"
-# Name "MM_Shared_Memory_Test - Win32 Alpha Unicode Debug"
-# Name "MM_Shared_Memory_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -362,148 +166,6 @@ DEP_CPP_MM_SH=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_MM_SH=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Shared_Memory.h"\
- "..\ace\Shared_Memory_MM.h"\
- "..\ace\Shared_Memory_MM.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "MM_Shared_Memory_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_MM_SH=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Shared_Memory.h"\
- "..\ace\Shared_Memory_MM.h"\
- "..\ace\Shared_Memory_MM.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/MT_SOCK_Test.dsp b/tests/MT_SOCK_Test.dsp
index 575ff0f8344..d4b4833b661 100644
--- a/tests/MT_SOCK_Test.dsp
+++ b/tests/MT_SOCK_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=MT_SOCK_Test - Win32 Alpha Unicode Release
+CFG=MT_SOCK_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=MT_SOCK_Test - Win32 Alpha Unicode Release
!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 "MT_SOCK_Test.mak"\
- CFG="MT_SOCK_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=MT_SOCK_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "MT_SOCK_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "MT_SOCK_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MT_SOCK_"
-# PROP BASE Intermediate_Dir "MT_SOCK_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MT_SOCK0"
-# PROP BASE Intermediate_Dir "MT_SOCK0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MT_SOCK_"
-# PROP BASE Intermediate_Dir "MT_SOCK_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MT_SOCK_"
-# PROP BASE Intermediate_Dir "MT_SOCK_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MT_SOCK0"
-# PROP BASE Intermediate_Dir "MT_SOCK0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MT_SOCK1"
-# PROP BASE Intermediate_Dir "MT_SOCK1"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "MT_SOCK_Test - Win32 Debug"
# Name "MT_SOCK_Test - Win32 Alpha Debug"
-# Name "MT_SOCK_Test - Win32 Release"
-# Name "MT_SOCK_Test - Win32 Unicode Debug"
-# Name "MT_SOCK_Test - Win32 Unicode Release"
-# Name "MT_SOCK_Test - Win32 Alpha Release"
-# Name "MT_SOCK_Test - Win32 Alpha Unicode Debug"
-# Name "MT_SOCK_Test - Win32 Alpha Unicode Release"
# Begin Source File
SOURCE=.\MT_SOCK_Test.cpp
@@ -375,180 +178,6 @@ DEP_CPP_MT_SO=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_MT_SO=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "MT_SOCK_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_MT_SO=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Map_Manager_Test.dsp b/tests/Map_Manager_Test.dsp
index 03ac8eb7d61..1867396ccfa 100644
--- a/tests/Map_Manager_Test.dsp
+++ b/tests/Map_Manager_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Map_Manager_Test - Win32 Alpha Unicode Release
+CFG=Map_Manager_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Map_Manager_Test - Win32 Alpha Unicode Release
!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 "Map_Manager_Test.mak"\
- CFG="Map_Manager_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Map_Manager_Test.mak" CFG="Map_Manager_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Map_Manager_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Map_Manager_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Map_Manager_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Map_Manager_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,198 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Map_Manager_Test\Debug"
-# PROP BASE Intermediate_Dir "Map_Manager_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Map_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Map_Manager_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Map_Manager_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Map_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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:IX86 /pdbtype:sept /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /incremental:no
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
-# SUBTRACT LINK32 /incremental:no
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Map_Manager_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Map_Manager_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Map_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Map_Manager_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Map_Manager_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Map_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Map_Manager_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Map_Manager_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Map_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Map_Manager_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Map_Manager_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Map_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Map_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Map_Manager_Test - Win32 Debug"
# Name "Map_Manager_Test - Win32 Alpha Debug"
-# Name "Map_Manager_Test - Win32 Release"
-# Name "Map_Manager_Test - Win32 Unicode Debug"
-# Name "Map_Manager_Test - Win32 Unicode Release"
-# Name "Map_Manager_Test - Win32 Alpha Release"
-# Name "Map_Manager_Test - Win32 Alpha Unicode Debug"
-# Name "Map_Manager_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -385,190 +186,6 @@ DEP_CPP_MAP_M=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_MAP_M=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Map_Manager_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_MAP_M=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Mem_Map_Test.dsp b/tests/Mem_Map_Test.dsp
index 9f452fae55b..0aefad4714f 100644
--- a/tests/Mem_Map_Test.dsp
+++ b/tests/Mem_Map_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Mem_Map_Test - Win32 Alpha Unicode Release
+CFG=Mem_Map_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Mem_Map_Test - Win32 Alpha Unicode Release
!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 "Mem_Map_Test.mak"\
- CFG="Mem_Map_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Mem_Map_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Mem_Map_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Mem_Map_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Mem_Map_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Mem_Map_Test\Debug"
-# PROP BASE Intermediate_Dir "Mem_Map_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Mem_Map_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Mem_Map_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Mem_Map_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Mem_Map_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Mem_Map_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Mem_Map_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Mem_Map_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Mem_Map_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Mem_Map_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Mem_Map_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Mem_Map_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Mem_Map_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Mem_Map_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Mem_Map_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Mem_Map_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Mem_Map_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Mem_Map_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Mem_Map_Test - Win32 Debug"
# Name "Mem_Map_Test - Win32 Alpha Debug"
-# Name "Mem_Map_Test - Win32 Release"
-# Name "Mem_Map_Test - Win32 Unicode Debug"
-# Name "Mem_Map_Test - Win32 Unicode Release"
-# Name "Mem_Map_Test - Win32 Alpha Release"
-# Name "Mem_Map_Test - Win32 Alpha Unicode Debug"
-# Name "Mem_Map_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -328,80 +131,6 @@ DEP_CPP_MEM_M=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_MEM_M=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Mem_Map_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_MEM_M=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Message_Block_Test.dsp b/tests/Message_Block_Test.dsp
index 18da84fd1ca..d96db19b983 100644
--- a/tests/Message_Block_Test.dsp
+++ b/tests/Message_Block_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Message_Block_Test - Win32 Alpha Unicode Release
+CFG=Message_Block_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Message_Block_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Message_Block_Test.mak"\
- CFG="Message_Block_Test - Win32 Alpha Unicode Release"
+ CFG="Message_Block_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Message_Block_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Message_Block_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Block_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Message_Block_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Block_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Block_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Block_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Block_Test\Debug"
-# PROP BASE Intermediate_Dir "Message_Block_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Block_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Message_Block_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Block_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Message_Block_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Block_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Message_Block_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Block_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Message_Block_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Block_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Message_Block_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Message_Block_Test - Win32 Debug"
# Name "Message_Block_Test - Win32 Alpha Debug"
-# Name "Message_Block_Test - Win32 Release"
-# Name "Message_Block_Test - Win32 Unicode Debug"
-# Name "Message_Block_Test - Win32 Unicode Release"
-# Name "Message_Block_Test - Win32 Alpha Release"
-# Name "Message_Block_Test - Win32 Alpha Unicode Debug"
-# Name "Message_Block_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -407,238 +211,6 @@ DEP_CPP_MESSA=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_MESSA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Message_Block_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_MESSA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Message_Queue_Notifications_Test.dsp b/tests/Message_Queue_Notifications_Test.dsp
index 6d2a595360e..0daea16871a 100644
--- a/tests/Message_Queue_Notifications_Test.dsp
+++ b/tests/Message_Queue_Notifications_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Message_Queue_Notifications_Test - Win32 Alpha Unicode Release
+CFG=Message_Queue_Notifications_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Message_Queue_Notifications_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak"\
- CFG="Message_Queue_Notifications_Test - Win32 Alpha Unicode Release"
+ CFG="Message_Queue_Notifications_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Message_Queue_Notifications_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Unicode Debug" (based\
- on "Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Unicode Release"\
- (based on "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,198 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_"
-# PROP BASE Intermediate_Dir "Message_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message0"
-# PROP BASE Intermediate_Dir "Message0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_"
-# PROP BASE Intermediate_Dir "Message_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_"
-# PROP BASE Intermediate_Dir "Message_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" ==\
- "Message_Queue_Notifications_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message0"
-# PROP BASE Intermediate_Dir "Message0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" ==\
- "Message_Queue_Notifications_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message1"
-# PROP BASE Intermediate_Dir "Message1"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Message_Queue_Notifications_Test - Win32 Debug"
# Name "Message_Queue_Notifications_Test - Win32 Alpha Debug"
-# Name "Message_Queue_Notifications_Test - Win32 Release"
-# Name "Message_Queue_Notifications_Test - Win32 Unicode Debug"
-# Name "Message_Queue_Notifications_Test - Win32 Unicode Release"
-# Name "Message_Queue_Notifications_Test - Win32 Alpha Release"
-# Name "Message_Queue_Notifications_Test - Win32 Alpha Unicode Debug"
-# Name "Message_Queue_Notifications_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -404,230 +206,6 @@ DEP_CPP_MESSA=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" ==\
- "Message_Queue_Notifications_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_MESSA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" ==\
- "Message_Queue_Notifications_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_MESSA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Message_Queue_Test.dsp b/tests/Message_Queue_Test.dsp
index cf7e8e22359..f4ecfb286ea 100644
--- a/tests/Message_Queue_Test.dsp
+++ b/tests/Message_Queue_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Message_Queue_Test - Win32 Alpha Unicode Release
+CFG=Message_Queue_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Message_Queue_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Message_Queue_Test.mak"\
- CFG="Message_Queue_Test - Win32 Alpha Unicode Release"
+ CFG="Message_Queue_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Message_Queue_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Message_Queue_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Message_Queue_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Message_Queue_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Queue_Test\Debug"
-# PROP BASE Intermediate_Dir "Message_Queue_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Queue_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Message_Queue_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Queue_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Message_Queue_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Queue_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Message_Queue_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Queue_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Message_Queue_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Message_Queue_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Message_Queue_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Message_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Message_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Message_Queue_Test - Win32 Debug"
# Name "Message_Queue_Test - Win32 Alpha Debug"
-# Name "Message_Queue_Test - Win32 Release"
-# Name "Message_Queue_Test - Win32 Unicode Debug"
-# Name "Message_Queue_Test - Win32 Unicode Release"
-# Name "Message_Queue_Test - Win32 Alpha Release"
-# Name "Message_Queue_Test - Win32 Alpha Unicode Debug"
-# Name "Message_Queue_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -391,206 +195,6 @@ DEP_CPP_MESSA=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_MESSA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Message_Queue_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_MESSA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Naming_Test.dsp b/tests/Naming_Test.dsp
index 14cbc1a7eb5..26a690f8891 100644
--- a/tests/Naming_Test.dsp
+++ b/tests/Naming_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Naming_Test - Win32 Alpha Unicode Release
+CFG=Naming_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Naming_Test - Win32 Alpha Unicode Release
!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 "Naming_Test.mak"\
- CFG="Naming_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Naming_Test.mak" CFG="Naming_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Naming_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Naming_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Naming_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Naming_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Naming_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Naming_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Naming_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Naming_Test\Debug"
-# PROP BASE Intermediate_Dir "Naming_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Naming_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Naming_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Naming_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Naming_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Naming_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Naming_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Naming_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Naming_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Naming_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Naming_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Naming_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Naming_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Naming_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Naming_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Naming_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Naming_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Naming_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Naming_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Naming_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Naming_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Naming_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Naming_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Naming_Test - Win32 Debug"
# Name "Naming_Test - Win32 Alpha Debug"
-# Name "Naming_Test - Win32 Release"
-# Name "Naming_Test - Win32 Unicode Debug"
-# Name "Naming_Test - Win32 Unicode Release"
-# Name "Naming_Test - Win32 Alpha Release"
-# Name "Naming_Test - Win32 Alpha Unicode Debug"
-# Name "Naming_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -397,218 +200,6 @@ DEP_CPP_NAMIN=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_NAMIN=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Name_Proxy.h"\
- "..\ace\Name_Request_Reply.h"\
- "..\ace\Name_Space.h"\
- "..\ace\Naming_Context.h"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Naming_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_NAMIN=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Name_Proxy.h"\
- "..\ace\Name_Request_Reply.h"\
- "..\ace\Name_Space.h"\
- "..\ace\Naming_Context.h"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Notify_Performance_Test.dsp b/tests/Notify_Performance_Test.dsp
index ec5fe817893..9094244e587 100644
--- a/tests/Notify_Performance_Test.dsp
+++ b/tests/Notify_Performance_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Notify_Performance_Test - Win32 Alpha Unicode Release
+CFG=Notify_Performance_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Notify_Performance_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Notify_Performance_Test.mak"\
- CFG="Notify_Performance_Test - Win32 Alpha Unicode Release"
+ CFG="Notify_Performance_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Notify_Performance_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Notify_Performance_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Notify_Performance_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Notify_P"
-# PROP BASE Intermediate_Dir "Notify_P"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Notify_0"
-# PROP BASE Intermediate_Dir "Notify_0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Notify_P"
-# PROP BASE Intermediate_Dir "Notify_P"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Notify_P"
-# PROP BASE Intermediate_Dir "Notify_P"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Notify_0"
-# PROP BASE Intermediate_Dir "Notify_0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Notify_1"
-# PROP BASE Intermediate_Dir "Notify_1"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Notify_Performance_Test - Win32 Debug"
# Name "Notify_Performance_Test - Win32 Alpha Debug"
-# Name "Notify_Performance_Test - Win32 Release"
-# Name "Notify_Performance_Test - Win32 Unicode Debug"
-# Name "Notify_Performance_Test - Win32 Unicode Release"
-# Name "Notify_Performance_Test - Win32 Alpha Release"
-# Name "Notify_Performance_Test - Win32 Alpha Unicode Debug"
-# Name "Notify_Performance_Test - Win32 Alpha Unicode Release"
# Begin Source File
SOURCE=.\Notify_Performance_Test.cpp
@@ -406,242 +210,6 @@ DEP_CPP_NOTIF=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_NOTIF=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Local_Tokens.h"\
- "..\ace\Local_Tokens.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Select_Reactor.h"\
- "..\ace\Select_Reactor.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Token.h"\
- "..\ace\Token.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Notify_Performance_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_NOTIF=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Local_Tokens.h"\
- "..\ace\Local_Tokens.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Select_Reactor.h"\
- "..\ace\Select_Reactor.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Token.h"\
- "..\ace\Token.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Pipe_Test.dsp b/tests/Pipe_Test.dsp
index 8366d8bdba0..139b0c75f53 100644
--- a/tests/Pipe_Test.dsp
+++ b/tests/Pipe_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Pipe_Test - Win32 Alpha Unicode Release
+CFG=Pipe_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,25 +14,13 @@ CFG=Pipe_Test - Win32 Alpha Unicode Release
!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 "Pipe_Test.mak" CFG="Pipe_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Pipe_Test.mak" CFG="Pipe_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Pipe_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "Pipe_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Pipe_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Pipe_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Pipe_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Pipe_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -81,8 +69,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Pipe_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -94,196 +82,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Pipe_Test\Debug"
-# PROP BASE Intermediate_Dir "Pipe_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Pipe_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Pipe_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Pipe_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Pipe_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Pipe_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Pipe_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Pipe_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Pipe_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Pipe_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Pipe_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Pipe_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Pipe_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Pipe_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Pipe_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Pipe_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Pipe_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Pipe_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Pipe_Test - Win32 Debug"
# Name "Pipe_Test - Win32 Alpha Debug"
-# Name "Pipe_Test - Win32 Release"
-# Name "Pipe_Test - Win32 Unicode Debug"
-# Name "Pipe_Test - Win32 Unicode Release"
-# Name "Pipe_Test - Win32 Alpha Release"
-# Name "Pipe_Test - Win32 Alpha Unicode Debug"
-# Name "Pipe_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -330,88 +134,6 @@ DEP_CPP_PIPE_=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_PIPE_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Process.h"\
- "..\ace\Process.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Pipe_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_PIPE_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Process.h"\
- "..\ace\Process.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Priority_Buffer_Test.dsp b/tests/Priority_Buffer_Test.dsp
index e6daa2a95cf..da4b145e296 100644
--- a/tests/Priority_Buffer_Test.dsp
+++ b/tests/Priority_Buffer_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Priority_Buffer_Test - Win32 Alpha Unicode Release
+CFG=Priority_Buffer_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Priority_Buffer_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Priority_Buffer_Test.mak"\
- CFG="Priority_Buffer_Test - Win32 Alpha Unicode Release"
+ CFG="Priority_Buffer_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Priority_Buffer_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Priority_Buffer_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Buffer_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Priority_Buffer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,198 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Buffer_Test\Debug"
-# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Buffer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Buffer_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Buffer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aced.lib 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:IX86 /pdbtype:sept /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /incremental:no
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\ace"
-# SUBTRACT LINK32 /incremental:no
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Buffer_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Buffer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Buffer_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Buffer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Buffer_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Buffer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Buffer_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Buffer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Buffer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Priority_Buffer_Test - Win32 Debug"
# Name "Priority_Buffer_Test - Win32 Alpha Debug"
-# Name "Priority_Buffer_Test - Win32 Release"
-# Name "Priority_Buffer_Test - Win32 Unicode Debug"
-# Name "Priority_Buffer_Test - Win32 Unicode Release"
-# Name "Priority_Buffer_Test - Win32 Alpha Release"
-# Name "Priority_Buffer_Test - Win32 Alpha Unicode Debug"
-# Name "Priority_Buffer_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -393,206 +195,6 @@ DEP_CPP_PRIOR=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_PRIOR=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Priority_Buffer_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_PRIOR=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Priority_Reactor_Test.dsp b/tests/Priority_Reactor_Test.dsp
index 7d727fcabca..dee2fc6856e 100644
--- a/tests/Priority_Reactor_Test.dsp
+++ b/tests/Priority_Reactor_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Priority_Reactor_Test - Win32 Alpha Unicode Release
+CFG=Priority_Reactor_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Priority_Reactor_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Priority_Reactor_Test.mak"\
- CFG="Priority_Reactor_Test - Win32 Alpha Unicode Release"
+ CFG="Priority_Reactor_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Priority_Reactor_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Priority_Reactor_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Reactor_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority"
-# PROP BASE Intermediate_Dir "Priority"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priorit0"
-# PROP BASE Intermediate_Dir "Priorit0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority"
-# PROP BASE Intermediate_Dir "Priority"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority"
-# PROP BASE Intermediate_Dir "Priority"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priorit0"
-# PROP BASE Intermediate_Dir "Priorit0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priorit1"
-# PROP BASE Intermediate_Dir "Priorit1"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Priority_Reactor_Test - Win32 Debug"
# Name "Priority_Reactor_Test - Win32 Alpha Debug"
-# Name "Priority_Reactor_Test - Win32 Release"
-# Name "Priority_Reactor_Test - Win32 Unicode Debug"
-# Name "Priority_Reactor_Test - Win32 Unicode Release"
-# Name "Priority_Reactor_Test - Win32 Alpha Release"
-# Name "Priority_Reactor_Test - Win32 Alpha Unicode Debug"
-# Name "Priority_Reactor_Test - Win32 Alpha Unicode Release"
# Begin Source File
SOURCE=.\Priority_Reactor_Test.cpp
@@ -443,322 +247,6 @@ DEP_CPP_PRIOR=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_PRIOR=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Connector.cpp"\
- "..\ace\Connector.h"\
- "..\ace\Connector.i"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Local_Tokens.h"\
- "..\ace\Local_Tokens.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Priority_Reactor.h"\
- "..\ace\Priority_Reactor.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Select_Reactor.h"\
- "..\ace\Select_Reactor.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Token.h"\
- "..\ace\Token.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\Priority_Reactor_Test.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Priority_Reactor_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_PRIOR=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Connector.cpp"\
- "..\ace\Connector.h"\
- "..\ace\Connector.i"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Local_Tokens.h"\
- "..\ace\Local_Tokens.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Priority_Reactor.h"\
- "..\ace\Priority_Reactor.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Select_Reactor.h"\
- "..\ace\Select_Reactor.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Token.h"\
- "..\ace\Token.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\Priority_Reactor_Test.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Priority_Task_Test.dsp b/tests/Priority_Task_Test.dsp
index 79f1412a3ca..4762256e236 100644
--- a/tests/Priority_Task_Test.dsp
+++ b/tests/Priority_Task_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Priority_Task_Test - Win32 Alpha Unicode Release
+CFG=Priority_Task_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Priority_Task_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Priority_Task_Test.mak"\
- CFG="Priority_Task_Test - Win32 Alpha Unicode Release"
+ CFG="Priority_Task_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Priority_Task_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Priority_Task_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Priority_Task_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Priority_Task_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Task_Test\Debug"
-# PROP BASE Intermediate_Dir "Priority_Task_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Task_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Priority_Task_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Task_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Priority_Task_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Task_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Priority_Task_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Task_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Priority_Task_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Priority_Task_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Priority_Task_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Priority_Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Priority_Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Priority_Task_Test - Win32 Debug"
# Name "Priority_Task_Test - Win32 Alpha Debug"
-# Name "Priority_Task_Test - Win32 Release"
-# Name "Priority_Task_Test - Win32 Unicode Debug"
-# Name "Priority_Task_Test - Win32 Unicode Release"
-# Name "Priority_Task_Test - Win32 Alpha Release"
-# Name "Priority_Task_Test - Win32 Alpha Unicode Debug"
-# Name "Priority_Task_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -404,232 +208,6 @@ DEP_CPP_PRIOR=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_PRIOR=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Sched_Params.h"\
- "..\ace\Sched_Params.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Priority_Task_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_PRIOR=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Sched_Params.h"\
- "..\ace\Sched_Params.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Process_Mutex_Test.dsp b/tests/Process_Mutex_Test.dsp
index 329524855c0..f72a469066a 100644
--- a/tests/Process_Mutex_Test.dsp
+++ b/tests/Process_Mutex_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Process_Mutex_Test - Win32 Alpha Unicode Release
+CFG=Process_Mutex_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Process_Mutex_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Process_Mutex_Test.mak"\
- CFG="Process_Mutex_Test - Win32 Alpha Unicode Release"
+ CFG="Process_Mutex_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Process_Mutex_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Process_Mutex_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Process_Mutex_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Process_Mutex_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Mutex_Test\Debug"
-# PROP BASE Intermediate_Dir "Process_Mutex_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Mutex_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Process_Mutex_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Mutex_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Process_Mutex_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Mutex_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Process_Mutex_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Mutex_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Process_Mutex_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Mutex_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Process_Mutex_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Process_Mutex_Test - Win32 Debug"
# Name "Process_Mutex_Test - Win32 Alpha Debug"
-# Name "Process_Mutex_Test - Win32 Release"
-# Name "Process_Mutex_Test - Win32 Unicode Debug"
-# Name "Process_Mutex_Test - Win32 Unicode Release"
-# Name "Process_Mutex_Test - Win32 Alpha Release"
-# Name "Process_Mutex_Test - Win32 Alpha Unicode Debug"
-# Name "Process_Mutex_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -344,112 +148,6 @@ DEP_CPP_PROCE=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_PROCE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Process.h"\
- "..\ace\Process.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Process_Mutex_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_PROCE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Process.h"\
- "..\ace\Process.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Process_Strategy_Test.dsp b/tests/Process_Strategy_Test.dsp
index 079a3e726c5..1b0b43211a9 100644
--- a/tests/Process_Strategy_Test.dsp
+++ b/tests/Process_Strategy_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Process_Strategy_Test - Win32 Alpha Unicode Release
+CFG=Process_Strategy_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Process_Strategy_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Process_Strategy_Test.mak"\
- CFG="Process_Strategy_Test - Win32 Alpha Unicode Release"
+ CFG="Process_Strategy_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Process_Strategy_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Process_Strategy_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Process_Strategy_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Process_Strategy_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Strategy_Test\Debug"
-# PROP BASE Intermediate_Dir "Process_Strategy_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Strategy_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Strategy_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Strategy_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Process_Strategy_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Strategy_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Strategy_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Strategy_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Process_Strategy_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Strategy_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Strategy_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Strategy_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Process_Strategy_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Strategy_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Strategy_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Strategy_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Process_Strategy_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Strategy_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Strategy_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Process_Strategy_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Process_Strategy_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Process_Strategy_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Process_Strategy_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Process_Strategy_Test - Win32 Debug"
# Name "Process_Strategy_Test - Win32 Alpha Debug"
-# Name "Process_Strategy_Test - Win32 Release"
-# Name "Process_Strategy_Test - Win32 Unicode Debug"
-# Name "Process_Strategy_Test - Win32 Unicode Release"
-# Name "Process_Strategy_Test - Win32 Alpha Release"
-# Name "Process_Strategy_Test - Win32 Alpha Unicode Debug"
-# Name "Process_Strategy_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -433,290 +237,6 @@ DEP_CPP_PROCE=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_PROCE=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\Process_Strategy_Test.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Process_Strategy_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_PROCE=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\Process_Strategy_Test.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Reactor_Exceptions_Test.dsp b/tests/Reactor_Exceptions_Test.dsp
index 5adc11b2fd4..24b130dc0e0 100644
--- a/tests/Reactor_Exceptions_Test.dsp
+++ b/tests/Reactor_Exceptions_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Exceptions_Test - Win32 Alpha Unicode Release
+CFG=Reactor_Exceptions_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reactor_Exceptions_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reactor_Exceptions_Test.mak"\
- CFG="Reactor_Exceptions_Test - Win32 Alpha Unicode Release"
+ CFG="Reactor_Exceptions_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Reactor_Exceptions_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Exceptions_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exceptions_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exceptions_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Exceptions_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Exceptions_Test\Debug"
-# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Exceptions_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Exceptions_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Exceptions_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Exceptions_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Exceptions_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Exceptions_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Exceptions_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Exceptions_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Exceptions_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Exceptions_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Exceptions_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Exceptions_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Exceptions_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Exceptions_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Exceptions_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Exceptions_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Exceptions_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Reactor_Exceptions_Test - Win32 Debug"
# Name "Reactor_Exceptions_Test - Win32 Alpha Debug"
-# Name "Reactor_Exceptions_Test - Win32 Release"
-# Name "Reactor_Exceptions_Test - Win32 Unicode Debug"
-# Name "Reactor_Exceptions_Test - Win32 Unicode Release"
-# Name "Reactor_Exceptions_Test - Win32 Alpha Release"
-# Name "Reactor_Exceptions_Test - Win32 Alpha Unicode Debug"
-# Name "Reactor_Exceptions_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -378,180 +182,6 @@ DEP_CPP_REACT=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_REACT=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Dgram.h"\
- "..\ace\SOCK_Dgram.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Reactor_Exceptions_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_REACT=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Dgram.h"\
- "..\ace\SOCK_Dgram.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Reactor_Notify_Test.dsp b/tests/Reactor_Notify_Test.dsp
index 98bd739f979..820731f5624 100644
--- a/tests/Reactor_Notify_Test.dsp
+++ b/tests/Reactor_Notify_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Notify_Test - Win32 Alpha Unicode Release
+CFG=Reactor_Notify_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reactor_Notify_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reactor_Notify_Test.mak"\
- CFG="Reactor_Notify_Test - Win32 Alpha Unicode Release"
+ CFG="Reactor_Notify_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Reactor_Notify_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Reactor_Notify_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Notify_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Notify_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Notify_Test\Debug"
-# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Notify_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Notify_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Notify_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Notify_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Notify_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Notify_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Notify_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Notify_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Notify_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Notify_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Notify_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Notify_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Reactor_Notify_Test - Win32 Debug"
# Name "Reactor_Notify_Test - Win32 Alpha Debug"
-# Name "Reactor_Notify_Test - Win32 Release"
-# Name "Reactor_Notify_Test - Win32 Unicode Debug"
-# Name "Reactor_Notify_Test - Win32 Unicode Release"
-# Name "Reactor_Notify_Test - Win32 Alpha Release"
-# Name "Reactor_Notify_Test - Win32 Alpha Unicode Debug"
-# Name "Reactor_Notify_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -404,232 +208,6 @@ DEP_CPP_REACT=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_REACT=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Reactor_Notify_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_REACT=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Reactor_Performance_Test.dsp b/tests/Reactor_Performance_Test.dsp
index 708881739bb..ba2afa894ec 100644
--- a/tests/Reactor_Performance_Test.dsp
+++ b/tests/Reactor_Performance_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Performance_Test - Win32 Alpha Unicode Release
+CFG=Reactor_Performance_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reactor_Performance_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reactor_Performance_Test.mak"\
- CFG="Reactor_Performance_Test - Win32 Alpha Unicode Release"
+ CFG="Reactor_Performance_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Reactor_Performance_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Reactor_Performance_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Performance_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_"
-# PROP BASE Intermediate_Dir "Reactor_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor0"
-# PROP BASE Intermediate_Dir "Reactor0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib 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 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_"
-# PROP BASE Intermediate_Dir "Reactor_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I ".." /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_"
-# PROP BASE Intermediate_Dir "Reactor_"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor0"
-# PROP BASE Intermediate_Dir "Reactor0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor1"
-# PROP BASE Intermediate_Dir "Reactor1"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Reactor_Performance_Test - Win32 Debug"
# Name "Reactor_Performance_Test - Win32 Alpha Debug"
-# Name "Reactor_Performance_Test - Win32 Release"
-# Name "Reactor_Performance_Test - Win32 Unicode Debug"
-# Name "Reactor_Performance_Test - Win32 Unicode Release"
-# Name "Reactor_Performance_Test - Win32 Alpha Release"
-# Name "Reactor_Performance_Test - Win32 Alpha Unicode Debug"
-# Name "Reactor_Performance_Test - Win32 Alpha Unicode Release"
# Begin Source File
SOURCE=.\Reactor_Performance_Test.cpp
@@ -444,326 +248,6 @@ DEP_CPP_REACT=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_REACT=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Connector.cpp"\
- "..\ace\Connector.h"\
- "..\ace\Connector.i"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Local_Tokens.h"\
- "..\ace\Local_Tokens.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Select_Reactor.h"\
- "..\ace\Select_Reactor.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Token.h"\
- "..\ace\Token.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\Reactor_Performance_Test.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Reactor_Performance_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_REACT=\
- "..\ace\Acceptor.cpp"\
- "..\ace\Acceptor.h"\
- "..\ace\Acceptor.i"\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Connector.cpp"\
- "..\ace\Connector.h"\
- "..\ace\Connector.i"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Dynamic.h"\
- "..\ace\Dynamic.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\High_Res_Timer.h"\
- "..\ace\High_Res_Timer.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Local_Tokens.h"\
- "..\ace\Local_Tokens.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Pipe.h"\
- "..\ace\Pipe.i"\
- "..\ace\Profile_Timer.h"\
- "..\ace\Profile_Timer.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Select_Reactor.h"\
- "..\ace\Select_Reactor.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\Singleton.cpp"\
- "..\ace\Singleton.h"\
- "..\ace\Singleton.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Svc_Handler.cpp"\
- "..\ace\Svc_Handler.h"\
- "..\ace\Svc_Handler.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Token.h"\
- "..\ace\Token.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\Reactor_Performance_Test.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Reactor_Timer_Test.dsp b/tests/Reactor_Timer_Test.dsp
index ac0f77b4681..331dc24207a 100644
--- a/tests/Reactor_Timer_Test.dsp
+++ b/tests/Reactor_Timer_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactor_Timer_Test - Win32 Alpha Unicode Release
+CFG=Reactor_Timer_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reactor_Timer_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reactor_Timer_Test.mak"\
- CFG="Reactor_Timer_Test - Win32 Alpha Unicode Release"
+ CFG="Reactor_Timer_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Reactor_Timer_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Reactor_Timer_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactor_Timer_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactor_Timer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Timer_Test\Debug"
-# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Timer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Timer_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Timer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Timer_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Timer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Timer_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Timer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Timer_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Timer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactor_Timer_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactor_Timer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactor_Timer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Reactor_Timer_Test - Win32 Debug"
# Name "Reactor_Timer_Test - Win32 Alpha Debug"
-# Name "Reactor_Timer_Test - Win32 Release"
-# Name "Reactor_Timer_Test - Win32 Unicode Debug"
-# Name "Reactor_Timer_Test - Win32 Unicode Release"
-# Name "Reactor_Timer_Test - Win32 Alpha Release"
-# Name "Reactor_Timer_Test - Win32 Alpha Unicode Debug"
-# Name "Reactor_Timer_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -366,156 +170,6 @@ DEP_CPP_REACT=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_REACT=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Reactor_Timer_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_REACT=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Reactors_Test.dsp b/tests/Reactors_Test.dsp
index f7979be2c77..21e8876a593 100644
--- a/tests/Reactors_Test.dsp
+++ b/tests/Reactors_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reactors_Test - Win32 Alpha Unicode Release
+CFG=Reactors_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Reactors_Test - Win32 Alpha Unicode Release
!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 "Reactors_Test.mak"\
- CFG="Reactors_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Reactors_Test.mak" CFG="Reactors_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Reactors_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Reactors_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Reactors_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reactors_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactors_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reactors_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reactors_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactors_Test\Debug"
-# PROP BASE Intermediate_Dir "Reactors_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactors_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactors_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Reactors_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactors_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactors_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Reactors_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactors_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactors_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Reactors_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactors_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactors_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Reactors_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactors_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reactors_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Reactors_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reactors_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reactors_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Reactors_Test - Win32 Debug"
# Name "Reactors_Test - Win32 Alpha Debug"
-# Name "Reactors_Test - Win32 Release"
-# Name "Reactors_Test - Win32 Unicode Debug"
-# Name "Reactors_Test - Win32 Unicode Release"
-# Name "Reactors_Test - Win32 Alpha Release"
-# Name "Reactors_Test - Win32 Alpha Unicode Debug"
-# Name "Reactors_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -402,228 +205,6 @@ DEP_CPP_REACT=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_REACT=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Reactors_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_REACT=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Reader_Writer_Test.dsp b/tests/Reader_Writer_Test.dsp
index f903775db65..96c8bfe5c26 100644
--- a/tests/Reader_Writer_Test.dsp
+++ b/tests/Reader_Writer_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Reader_Writer_Test - Win32 Alpha Unicode Release
+CFG=Reader_Writer_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Reader_Writer_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Reader_Writer_Test.mak"\
- CFG="Reader_Writer_Test - Win32 Alpha Unicode Release"
+ CFG="Reader_Writer_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Reader_Writer_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Reader_Writer_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Reader_Writer_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Reader_Writer_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reader_Writer_Test\Debug"
-# PROP BASE Intermediate_Dir "Reader_Writer_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reader_Writer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reader_Writer_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Reader_Writer_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reader_Writer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reader_Writer_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Reader_Writer_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reader_Writer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reader_Writer_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Reader_Writer_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reader_Writer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reader_Writer_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Reader_Writer_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reader_Writer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Reader_Writer_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Reader_Writer_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Reader_Writer_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Reader_Writer_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Reader_Writer_Test - Win32 Debug"
# Name "Reader_Writer_Test - Win32 Alpha Debug"
-# Name "Reader_Writer_Test - Win32 Release"
-# Name "Reader_Writer_Test - Win32 Unicode Debug"
-# Name "Reader_Writer_Test - Win32 Unicode Release"
-# Name "Reader_Writer_Test - Win32 Alpha Release"
-# Name "Reader_Writer_Test - Win32 Alpha Unicode Debug"
-# Name "Reader_Writer_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -361,146 +165,6 @@ DEP_CPP_READE=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_READE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Reader_Writer_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_READE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Recursive_Mutex_Test.dsp b/tests/Recursive_Mutex_Test.dsp
index f56adc730d6..16be980c42b 100644
--- a/tests/Recursive_Mutex_Test.dsp
+++ b/tests/Recursive_Mutex_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Recursive_Mutex_Test - Win32 Alpha Unicode Release
+CFG=Recursive_Mutex_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Recursive_Mutex_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak"\
- CFG="Recursive_Mutex_Test - Win32 Alpha Unicode Release"
+ CFG="Recursive_Mutex_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Recursive_Mutex_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Recursive_Mutex_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Recursive_Mutex_Test\Debug"
-# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Recursive_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Recursive_Mutex_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Recursive_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Recursive_Mutex_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Recursive_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Recursive_Mutex_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Recursive_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Recursive_Mutex_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Recursive_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Recursive_Mutex_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Recursive_Mutex_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Recursive_Mutex_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Recursive_Mutex_Test - Win32 Debug"
# Name "Recursive_Mutex_Test - Win32 Alpha Debug"
-# Name "Recursive_Mutex_Test - Win32 Release"
-# Name "Recursive_Mutex_Test - Win32 Unicode Debug"
-# Name "Recursive_Mutex_Test - Win32 Unicode Release"
-# Name "Recursive_Mutex_Test - Win32 Alpha Release"
-# Name "Recursive_Mutex_Test - Win32 Alpha Unicode Debug"
-# Name "Recursive_Mutex_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -361,146 +165,6 @@ DEP_CPP_RECUR=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_RECUR=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Recursive_Mutex_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_RECUR=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/SOCK_Connector_Test.dsp b/tests/SOCK_Connector_Test.dsp
new file mode 100644
index 00000000000..c90f45743ec
--- /dev/null
+++ b/tests/SOCK_Connector_Test.dsp
@@ -0,0 +1,78 @@
+# Microsoft Developer Studio Project File - Name="SOCK_Connector_Test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=SOCK_Connector_Test - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "SOCK_Connector_Test.mak".
+!MESSAGE
+!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 "SOCK_Connector_Test.mak"\
+ CFG="SOCK_Connector_Test - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "SOCK_Connector_Test - Win32 Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "SOCK_Connector_Test\Debug"
+# PROP BASE Intermediate_Dir "SOCK_Connector_Test\Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "SOCK_Connector_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "."
+# PROP Intermediate_Dir ".\DLL\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "SOCK_Connector_Test"
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=1 /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib 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 /libpath:"..\..\ace"
+# ADD LINK32 aced.lib 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 /libpath:"..\ace"
+# Begin Target
+
+# Name "SOCK_Connector_Test - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\SOCK_Connector_Test.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\test_config.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/tests/SOCK_Test.dsp b/tests/SOCK_Test.dsp
index 394b963231d..57c5620046e 100644
--- a/tests/SOCK_Test.dsp
+++ b/tests/SOCK_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SOCK_Test - Win32 Alpha Unicode Release
+CFG=SOCK_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,25 +14,13 @@ CFG=SOCK_Test - Win32 Alpha Unicode Release
!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 "SOCK_Test.mak" CFG="SOCK_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "SOCK_Test.mak" CFG="SOCK_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "SOCK_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "SOCK_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "SOCK_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SOCK_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "SOCK_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "SOCK_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -81,8 +69,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "SOCK_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -94,196 +82,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SOCK_Test\Debug"
-# PROP BASE Intermediate_Dir "SOCK_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SOCK_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SOCK_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "SOCK_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SOCK_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SOCK_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "SOCK_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SOCK_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SOCK_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "SOCK_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SOCK_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SOCK_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "SOCK_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SOCK_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SOCK_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "SOCK_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SOCK_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SOCK_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "SOCK_Test - Win32 Debug"
# Name "SOCK_Test - Win32 Alpha Debug"
-# Name "SOCK_Test - Win32 Release"
-# Name "SOCK_Test - Win32 Unicode Debug"
-# Name "SOCK_Test - Win32 Unicode Release"
-# Name "SOCK_Test - Win32 Alpha Release"
-# Name "SOCK_Test - Win32 Alpha Unicode Debug"
-# Name "SOCK_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -376,180 +180,6 @@ DEP_CPP_SOCK_=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_SOCK_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "SOCK_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_SOCK_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Acceptor.h"\
- "..\ace\SOCK_Acceptor.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/SPIPE_Test.dsp b/tests/SPIPE_Test.dsp
index e5de3452733..9e72871d25b 100644
--- a/tests/SPIPE_Test.dsp
+++ b/tests/SPIPE_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SPIPE_Test - Win32 Alpha Unicode Release
+CFG=SPIPE_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=SPIPE_Test - Win32 Alpha Unicode Release
!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 "SPIPE_Test.mak"\
- CFG="SPIPE_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=SPIPE_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "SPIPE_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "SPIPE_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SPIPE_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "SPIPE_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "SPIPE_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "SPIPE_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SPIPE_Test\Debug"
-# PROP BASE Intermediate_Dir "SPIPE_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SPIPE_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SPIPE_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "SPIPE_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SPIPE_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SPIPE_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "SPIPE_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SPIPE_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SPIPE_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "SPIPE_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SPIPE_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SPIPE_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "SPIPE_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SPIPE_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SPIPE_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "SPIPE_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SPIPE_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SPIPE_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "SPIPE_Test - Win32 Debug"
# Name "SPIPE_Test - Win32 Alpha Debug"
-# Name "SPIPE_Test - Win32 Release"
-# Name "SPIPE_Test - Win32 Unicode Debug"
-# Name "SPIPE_Test - Win32 Unicode Release"
-# Name "SPIPE_Test - Win32 Alpha Release"
-# Name "SPIPE_Test - Win32 Alpha Unicode Debug"
-# Name "SPIPE_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -372,168 +175,6 @@ DEP_CPP_SPIPE=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_SPIPE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SPIPE.h"\
- "..\ace\SPIPE.i"\
- "..\ace\SPIPE_Acceptor.h"\
- "..\ace\SPIPE_Addr.h"\
- "..\ace\SPIPE_Addr.i"\
- "..\ace\SPIPE_Connector.h"\
- "..\ace\SPIPE_Connector.i"\
- "..\ace\SPIPE_Stream.h"\
- "..\ace\SPIPE_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "SPIPE_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_SPIPE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SPIPE.h"\
- "..\ace\SPIPE.i"\
- "..\ace\SPIPE_Acceptor.h"\
- "..\ace\SPIPE_Addr.h"\
- "..\ace\SPIPE_Addr.i"\
- "..\ace\SPIPE_Connector.h"\
- "..\ace\SPIPE_Connector.i"\
- "..\ace\SPIPE_Stream.h"\
- "..\ace\SPIPE_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/SString_Test.dsp b/tests/SString_Test.dsp
index a603b072bbf..2f4da2464e2 100644
--- a/tests/SString_Test.dsp
+++ b/tests/SString_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SString_Test - Win32 Alpha Unicode Release
+CFG=SString_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=SString_Test - Win32 Alpha Unicode Release
!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 "SString_Test.mak"\
- CFG="SString_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=SString_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "SString_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "SString_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SString_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "SString_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "SString_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "SString_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SString_Test\Debug"
-# PROP BASE Intermediate_Dir "SString_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SString_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SString_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "SString_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SString_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SString_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "SString_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SString_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SString_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "SString_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SString_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SString_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "SString_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SString_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SString_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "SString_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SString_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SString_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "SString_Test - Win32 Debug"
# Name "SString_Test - Win32 Alpha Debug"
-# Name "SString_Test - Win32 Release"
-# Name "SString_Test - Win32 Unicode Debug"
-# Name "SString_Test - Win32 Unicode Release"
-# Name "SString_Test - Win32 Alpha Release"
-# Name "SString_Test - Win32 Alpha Unicode Debug"
-# Name "SString_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -326,76 +129,6 @@ DEP_CPP_SSTRI=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_SSTRI=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "SString_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_SSTRI=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/SV_Shared_Memory_Test.dsp b/tests/SV_Shared_Memory_Test.dsp
index fc8223686da..a9dbf2e4641 100644
--- a/tests/SV_Shared_Memory_Test.dsp
+++ b/tests/SV_Shared_Memory_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=SV_Shared_Memory_Test - Win32 Alpha Unicode Release
+CFG=SV_Shared_Memory_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=SV_Shared_Memory_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "SV_Shared_Memory_Test.mak"\
- CFG="SV_Shared_Memory_Test - Win32 Alpha Unicode Release"
+ CFG="SV_Shared_Memory_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=SV_Shared_Memory_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "SV_Shared_Memory_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SV_Shared_Memory_Test\Debug"
-# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SV_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SV_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SV_Shared_Memory_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SV_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SV_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SV_Shared_Memory_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SV_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SV_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SV_Shared_Memory_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SV_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SV_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SV_Shared_Memory_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SV_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SV_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "SV_Shared_Memory_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "SV_Shared_Memory_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "SV_Shared_Memory_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "SV_Shared_Memory_Test - Win32 Debug"
# Name "SV_Shared_Memory_Test - Win32 Alpha Debug"
-# Name "SV_Shared_Memory_Test - Win32 Release"
-# Name "SV_Shared_Memory_Test - Win32 Unicode Debug"
-# Name "SV_Shared_Memory_Test - Win32 Unicode Release"
-# Name "SV_Shared_Memory_Test - Win32 Alpha Release"
-# Name "SV_Shared_Memory_Test - Win32 Alpha Unicode Debug"
-# Name "SV_Shared_Memory_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -357,138 +161,6 @@ DEP_CPP_SV_SH=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_SV_SH=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "SV_Shared_Memory_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_SV_SH=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Semaphore_Test.dsp b/tests/Semaphore_Test.dsp
index 6587dc02dca..465705e7f9a 100644
--- a/tests/Semaphore_Test.dsp
+++ b/tests/Semaphore_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Semaphore_Test - Win32 Alpha Unicode Release
+CFG=Semaphore_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Semaphore_Test - Win32 Alpha Unicode Release
!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 "Semaphore_Test.mak"\
- CFG="Semaphore_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Semaphore_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Semaphore_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Semaphore_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Semaphore_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Semaphore_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Semaphore_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Semaphor"
-# PROP BASE Intermediate_Dir "Semaphor"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Semapho0"
-# PROP BASE Intermediate_Dir "Semapho0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Semaphor"
-# PROP BASE Intermediate_Dir "Semaphor"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Semaphor"
-# PROP BASE Intermediate_Dir "Semaphor"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Semapho0"
-# PROP BASE Intermediate_Dir "Semapho0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Semapho1"
-# PROP BASE Intermediate_Dir "Semapho1"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Semaphore_Test - Win32 Debug"
# Name "Semaphore_Test - Win32 Alpha Debug"
-# Name "Semaphore_Test - Win32 Release"
-# Name "Semaphore_Test - Win32 Unicode Debug"
-# Name "Semaphore_Test - Win32 Unicode Release"
-# Name "Semaphore_Test - Win32 Alpha Release"
-# Name "Semaphore_Test - Win32 Alpha Unicode Debug"
-# Name "Semaphore_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp"
@@ -361,146 +164,6 @@ DEP_CPP_SEMAP=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_SEMAP=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Semaphore_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_SEMAP=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Service_Config_Test.dsp b/tests/Service_Config_Test.dsp
index d758cdb37e6..9e9be6da841 100644
--- a/tests/Service_Config_Test.dsp
+++ b/tests/Service_Config_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Service_Config_Test - Win32 Alpha Unicode Release
+CFG=Service_Config_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Service_Config_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Service_Config_Test.mak"\
- CFG="Service_Config_Test - Win32 Alpha Unicode Release"
+ CFG="Service_Config_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Service_Config_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Service_Config_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Service_Config_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Service_Config_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Service_Config_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Service_Config_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Service_Config_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Service_Config_Test\Debug"
-# PROP BASE Intermediate_Dir "Service_Config_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Service_Config_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Service_Config_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Service_Config_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Service_Config_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Service_Config_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Service_Config_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Service_Config_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Service_Config_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Service_Config_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Service_Config_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Service_Config_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Service_Config_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Service_Config_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Service_Config_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Service_Config_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Service_Config_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Service_Config_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Service_Config_Test - Win32 Debug"
# Name "Service_Config_Test - Win32 Alpha Debug"
-# Name "Service_Config_Test - Win32 Release"
-# Name "Service_Config_Test - Win32 Unicode Debug"
-# Name "Service_Config_Test - Win32 Unicode Release"
-# Name "Service_Config_Test - Win32 Alpha Release"
-# Name "Service_Config_Test - Win32 Alpha Unicode Debug"
-# Name "Service_Config_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -373,170 +177,6 @@ DEP_CPP_SERVI=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_SERVI=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Service_Config_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_SERVI=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Sigset_Ops_Test.dsp b/tests/Sigset_Ops_Test.dsp
index de5c8877e5e..b2a522da344 100644
--- a/tests/Sigset_Ops_Test.dsp
+++ b/tests/Sigset_Ops_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Sigset_Ops_Test - Win32 Alpha Unicode Release
+CFG=Sigset_Ops_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Sigset_Ops_Test - Win32 Alpha Unicode Release
!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 "Sigset_Ops_Test.mak"\
- CFG="Sigset_Ops_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Sigset_Ops_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Sigset_Ops_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Sigset_Ops_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Ops_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Ops_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Sigset_Ops_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Sigset_Ops_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Sigset_Ops_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Sigset_Ops_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Sigset_Ops_Test\Debug"
-# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Sigset_Ops_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Sigset_Ops_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Sigset_Ops_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Sigset_Ops_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Sigset_Ops_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Sigset_Ops_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Sigset_Ops_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Sigset_Ops_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Sigset_Ops_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Sigset_Ops_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Sigset_Ops_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Sigset_Ops_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Sigset_Ops_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Sigset_Ops_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Sigset_Ops_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Sigset_Ops_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Sigset_Ops_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Sigset_Ops_Test - Win32 Debug"
# Name "Sigset_Ops_Test - Win32 Alpha Debug"
-# Name "Sigset_Ops_Test - Win32 Release"
-# Name "Sigset_Ops_Test - Win32 Unicode Debug"
-# Name "Sigset_Ops_Test - Win32 Unicode Release"
-# Name "Sigset_Ops_Test - Win32 Alpha Release"
-# Name "Sigset_Ops_Test - Win32 Alpha Unicode Debug"
-# Name "Sigset_Ops_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -326,76 +129,6 @@ DEP_CPP_SIGSE=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_SIGSE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Sigset_Ops_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_SIGSE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Simple_Message_Block_Test.dsp b/tests/Simple_Message_Block_Test.dsp
index 1353a075f4f..2ead2f43c72 100644
--- a/tests/Simple_Message_Block_Test.dsp
+++ b/tests/Simple_Message_Block_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Simple_Message_Block_Test - Win32 Alpha Unicode Release
+CFG=Simple_Message_Block_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Simple_Message_Block_Test - Win32 Alpha Unicode Release
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak"\
- CFG="Simple_Message_Block_Test - Win32 Alpha Unicode Release"
+ CFG="Simple_Message_Block_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Simple_Message_Block_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Simple_Message_Block_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Simple_Message_Block_Test\Debug"
-# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Simple_Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Simple_Message_Block_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Simple_Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Simple_Message_Block_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Simple_Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Simple_Message_Block_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Simple_Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Simple_Message_Block_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Simple_Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Simple_Message_Block_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Simple_Message_Block_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Simple_Message_Block_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Simple_Message_Block_Test - Win32 Debug"
# Name "Simple_Message_Block_Test - Win32 Alpha Debug"
-# Name "Simple_Message_Block_Test - Win32 Release"
-# Name "Simple_Message_Block_Test - Win32 Unicode Debug"
-# Name "Simple_Message_Block_Test - Win32 Unicode Release"
-# Name "Simple_Message_Block_Test - Win32 Alpha Release"
-# Name "Simple_Message_Block_Test - Win32 Alpha Unicode Debug"
-# Name "Simple_Message_Block_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -359,142 +163,6 @@ DEP_CPP_SIMPL=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_SIMPL=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Simple_Message_Block_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_SIMPL=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/TSS_Test.dsp b/tests/TSS_Test.dsp
index 0582cb17d75..c16edbc16e6 100644
--- a/tests/TSS_Test.dsp
+++ b/tests/TSS_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=TSS_Test - Win32 Alpha Unicode Release
+CFG=TSS_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,25 +14,13 @@ CFG=TSS_Test - Win32 Alpha Unicode Release
!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 "TSS_Test.mak" CFG="TSS_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "TSS_Test.mak" CFG="TSS_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "TSS_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "TSS_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "TSS_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "TSS_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "TSS_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "TSS_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -81,8 +69,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "TSS_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -94,196 +82,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "TSS_Test\Debug"
-# PROP BASE Intermediate_Dir "TSS_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "TSS_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "TSS_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "TSS_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "TSS_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "TSS_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "TSS_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "TSS_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "TSS_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "TSS_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "TSS_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "TSS_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "TSS_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "TSS_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "TSS_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "TSS_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "TSS_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "TSS_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "TSS_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "TSS_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "TSS_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "TSS_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "TSS_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "TSS_Test - Win32 Debug"
# Name "TSS_Test - Win32 Alpha Debug"
-# Name "TSS_Test - Win32 Release"
-# Name "TSS_Test - Win32 Unicode Debug"
-# Name "TSS_Test - Win32 Unicode Release"
-# Name "TSS_Test - Win32 Alpha Release"
-# Name "TSS_Test - Win32 Alpha Unicode Debug"
-# Name "TSS_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -358,144 +162,6 @@ DEP_CPP_TSS_T=\
".\TSS_Test_Errno.h"\
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_TSS_T=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
- ".\TSS_Test_Errno.h"\
-
-
-!ELSEIF "$(CFG)" == "TSS_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_TSS_T=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
- ".\TSS_Test_Errno.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Task_Test.dsp b/tests/Task_Test.dsp
index fadefd87d5b..e5b3c540bf4 100644
--- a/tests/Task_Test.dsp
+++ b/tests/Task_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Task_Test - Win32 Alpha Unicode Release
+CFG=Task_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,25 +14,13 @@ CFG=Task_Test - Win32 Alpha Unicode Release
!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 "Task_Test.mak" CFG="Task_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Task_Test.mak" CFG="Task_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Task_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "Task_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Task_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Task_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Task_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Task_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -81,8 +69,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Task_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -94,196 +82,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Task_Test\Debug"
-# PROP BASE Intermediate_Dir "Task_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Task_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Task_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Task_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Task_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Task_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Task_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Task_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Task_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Task_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Task_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Task_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Task_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Task_Test - Win32 Debug"
# Name "Task_Test - Win32 Alpha Debug"
-# Name "Task_Test - Win32 Release"
-# Name "Task_Test - Win32 Unicode Debug"
-# Name "Task_Test - Win32 Unicode Release"
-# Name "Task_Test - Win32 Alpha Release"
-# Name "Task_Test - Win32 Alpha Unicode Debug"
-# Name "Task_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -400,228 +204,6 @@ DEP_CPP_TASK_=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_TASK_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Task_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_TASK_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Thread_Manager_Test.dsp b/tests/Thread_Manager_Test.dsp
index e077805f024..fee621b7791 100644
--- a/tests/Thread_Manager_Test.dsp
+++ b/tests/Thread_Manager_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Thread_Manager_Test - Win32 Alpha Unicode Debug
+CFG=Thread_Manager_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -15,7 +15,7 @@ CFG=Thread_Manager_Test - Win32 Alpha Unicode Debug
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Thread_Manager_Test.mak"\
- CFG="Thread_Manager_Test - Win32 Alpha Unicode Debug"
+ CFG="Thread_Manager_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +23,6 @@ CFG=Thread_Manager_Test - Win32 Alpha Unicode Debug
"Win32 (x86) Console Application")
!MESSAGE "Thread_Manager_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Thread_Manager_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +71,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Thread_Manager_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +84,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Manager_Test\Debug"
-# PROP BASE Intermediate_Dir "Thread_Manager_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Manager_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Thread_Manager_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Manager_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Thread_Manager_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Manager_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Thread_Manager_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Manager_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Thread_Manager_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Manager_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Thread_Manager_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Manager_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Manager_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
!ENDIF
# Begin Target
# Name "Thread_Manager_Test - Win32 Debug"
# Name "Thread_Manager_Test - Win32 Alpha Debug"
-# Name "Thread_Manager_Test - Win32 Release"
-# Name "Thread_Manager_Test - Win32 Unicode Debug"
-# Name "Thread_Manager_Test - Win32 Unicode Release"
-# Name "Thread_Manager_Test - Win32 Alpha Release"
-# Name "Thread_Manager_Test - Win32 Alpha Unicode Release"
-# Name "Thread_Manager_Test - Win32 Alpha Unicode Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -359,144 +163,6 @@ DEP_CPP_THREA=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_THREA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
- ".\Thread_Manager_Test.h"\
-
-
-!ELSEIF "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_THREA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
- ".\Thread_Manager_Test.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Thread_Pool_Test.dsp b/tests/Thread_Pool_Test.dsp
index 5a365c6f778..c18c5fff151 100644
--- a/tests/Thread_Pool_Test.dsp
+++ b/tests/Thread_Pool_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Thread_Pool_Test - Win32 Alpha Unicode Release
+CFG=Thread_Pool_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Thread_Pool_Test - Win32 Alpha Unicode Release
!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 "Thread_Pool_Test.mak"\
- CFG="Thread_Pool_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Thread_Pool_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Thread_Pool_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Thread_Pool_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Thread_Pool_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Pool_Test\Debug"
-# PROP BASE Intermediate_Dir "Thread_Pool_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Pool_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Pool_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Thread_Pool_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Pool_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Pool_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Thread_Pool_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Pool_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Pool_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Thread_Pool_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Pool_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Pool_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Thread_Pool_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Pool_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Thread_Pool_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Thread_Pool_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Thread_Pool_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Thread_Pool_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Thread_Pool_Test - Win32 Debug"
# Name "Thread_Pool_Test - Win32 Alpha Debug"
-# Name "Thread_Pool_Test - Win32 Release"
-# Name "Thread_Pool_Test - Win32 Unicode Debug"
-# Name "Thread_Pool_Test - Win32 Unicode Release"
-# Name "Thread_Pool_Test - Win32 Alpha Release"
-# Name "Thread_Pool_Test - Win32 Alpha Unicode Debug"
-# Name "Thread_Pool_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -402,228 +205,6 @@ DEP_CPP_THREA=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_THREA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_THREA=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Time_Service_Test.dsp b/tests/Time_Service_Test.dsp
index ead8d8e7d49..56e887badc8 100644
--- a/tests/Time_Service_Test.dsp
+++ b/tests/Time_Service_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Time_Service_Test - Win32 Alpha Unicode Release
+CFG=Time_Service_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Time_Service_Test - Win32 Alpha Unicode Release
!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 "Time_Service_Test.mak"\
- CFG="Time_Service_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Time_Service_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Time_Service_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Time_Service_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Time_Service_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Time_Service_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Time_Service_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Time_Service_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Service_Test\Debug"
-# PROP BASE Intermediate_Dir "Time_Service_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Service_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Service_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Time_Service_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Service_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Service_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Time_Service_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Service_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 odbc32.lib odbccp32.lib wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 odbc32.lib odbccp32.lib wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Service_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Time_Service_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Service_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Service_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Time_Service_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Service_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Service_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Time_Service_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Service_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Service_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Time_Service_Test - Win32 Debug"
# Name "Time_Service_Test - Win32 Alpha Debug"
-# Name "Time_Service_Test - Win32 Release"
-# Name "Time_Service_Test - Win32 Unicode Debug"
-# Name "Time_Service_Test - Win32 Unicode Release"
-# Name "Time_Service_Test - Win32 Alpha Release"
-# Name "Time_Service_Test - Win32 Alpha Unicode Debug"
-# Name "Time_Service_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -328,80 +131,6 @@ DEP_CPP_TIME_=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_TIME_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Process.h"\
- "..\ace\Process.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Time_Service_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_TIME_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Process.h"\
- "..\ace\Process.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Time_Value_Test.dsp b/tests/Time_Value_Test.dsp
index a526e5910b1..3b6104ca4c9 100644
--- a/tests/Time_Value_Test.dsp
+++ b/tests/Time_Value_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Time_Value_Test - Win32 Alpha Unicode Release
+CFG=Time_Value_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Time_Value_Test - Win32 Alpha Unicode Release
!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 "Time_Value_Test.mak"\
- CFG="Time_Value_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Time_Value_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Time_Value_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Time_Value_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Time_Value_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Time_Value_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Time_Value_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Time_Value_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Value_Test\Debug"
-# PROP BASE Intermediate_Dir "Time_Value_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Value_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Value_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Time_Value_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Value_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Value_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Time_Value_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Value_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Value_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Time_Value_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Value_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Value_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Time_Value_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Value_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Time_Value_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Time_Value_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Time_Value_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Time_Value_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Time_Value_Test - Win32 Debug"
# Name "Time_Value_Test - Win32 Alpha Debug"
-# Name "Time_Value_Test - Win32 Release"
-# Name "Time_Value_Test - Win32 Unicode Debug"
-# Name "Time_Value_Test - Win32 Unicode Release"
-# Name "Time_Value_Test - Win32 Alpha Release"
-# Name "Time_Value_Test - Win32 Alpha Unicode Debug"
-# Name "Time_Value_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -326,76 +129,6 @@ DEP_CPP_TIME_=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_TIME_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Time_Value_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_TIME_=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/Timer_Queue_Test.dsp b/tests/Timer_Queue_Test.dsp
index ca981b70d48..bacb3786877 100644
--- a/tests/Timer_Queue_Test.dsp
+++ b/tests/Timer_Queue_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Timer_Queue_Test - Win32 Alpha Unicode Release
+CFG=Timer_Queue_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Timer_Queue_Test - Win32 Alpha Unicode Release
!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 "Timer_Queue_Test.mak"\
- CFG="Timer_Queue_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Timer_Queue_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Timer_Queue_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Timer_Queue_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Timer_Queue_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Timer_Queue_Test\Debug"
-# PROP BASE Intermediate_Dir "Timer_Queue_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Timer_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Timer_Queue_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Timer_Queue_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Timer_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Timer_Queue_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Timer_Queue_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Timer_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Timer_Queue_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Timer_Queue_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Timer_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Timer_Queue_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Timer_Queue_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Timer_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Timer_Queue_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Timer_Queue_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Timer_Queue_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Timer_Queue_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Timer_Queue_Test - Win32 Debug"
# Name "Timer_Queue_Test - Win32 Alpha Debug"
-# Name "Timer_Queue_Test - Win32 Release"
-# Name "Timer_Queue_Test - Win32 Unicode Debug"
-# Name "Timer_Queue_Test - Win32 Unicode Release"
-# Name "Timer_Queue_Test - Win32 Alpha Release"
-# Name "Timer_Queue_Test - Win32 Alpha Unicode Debug"
-# Name "Timer_Queue_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -378,18 +181,6 @@ DEP_CPP_TIMER=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Unicode Release"
-
!ENDIF
# End Source File
diff --git a/tests/Tokens_Test.dsp b/tests/Tokens_Test.dsp
index 20f3a617c88..0cd33bb9c1c 100644
--- a/tests/Tokens_Test.dsp
+++ b/tests/Tokens_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=Tokens_Test - Win32 Alpha Unicode Release
+CFG=Tokens_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=Tokens_Test - Win32 Alpha Unicode Release
!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 "Tokens_Test.mak"\
- CFG="Tokens_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "Tokens_Test.mak" CFG="Tokens_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=Tokens_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "Tokens_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "Tokens_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Tokens_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Tokens_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Tokens_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "Tokens_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Tokens_Test\Debug"
-# PROP BASE Intermediate_Dir "Tokens_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Tokens_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Tokens_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "Tokens_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Tokens_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Tokens_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "Tokens_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Tokens_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Tokens_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "Tokens_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Tokens_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Tokens_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "Tokens_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Tokens_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Tokens_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "Tokens_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "Tokens_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "Tokens_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "Tokens_Test - Win32 Debug"
# Name "Tokens_Test - Win32 Alpha Debug"
-# Name "Tokens_Test - Win32 Release"
-# Name "Tokens_Test - Win32 Unicode Debug"
-# Name "Tokens_Test - Win32 Unicode Release"
-# Name "Tokens_Test - Win32 Alpha Release"
-# Name "Tokens_Test - Win32 Alpha Unicode Debug"
-# Name "Tokens_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -408,240 +211,6 @@ DEP_CPP_TOKEN=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_TOKEN=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Local_Tokens.h"\
- "..\ace\Local_Tokens.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Process.h"\
- "..\ace\Process.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Remote_Tokens.h"\
- "..\ace\Remote_Tokens.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Token_Collection.h"\
- "..\ace\Token_Collection.i"\
- "..\ace\Token_Invariants.h"\
- "..\ace\Token_Invariants.i"\
- "..\ace\Token_Request_Reply.h"\
- "..\ace\Token_Request_Reply.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "Tokens_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_TOKEN=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Get_Opt.h"\
- "..\ace\Get_Opt.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\INET_Addr.h"\
- "..\ace\INET_Addr.i"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Local_Tokens.h"\
- "..\ace\Local_Tokens.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Map_Manager.cpp"\
- "..\ace\Map_Manager.h"\
- "..\ace\Map_Manager.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Process.h"\
- "..\ace\Process.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Remote_Tokens.h"\
- "..\ace\Remote_Tokens.i"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SOCK.h"\
- "..\ace\SOCK.i"\
- "..\ace\SOCK_Connector.h"\
- "..\ace\SOCK_Connector.i"\
- "..\ace\SOCK_IO.h"\
- "..\ace\SOCK_IO.i"\
- "..\ace\SOCK_Stream.h"\
- "..\ace\SOCK_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Token_Collection.h"\
- "..\ace\Token_Collection.i"\
- "..\ace\Token_Invariants.h"\
- "..\ace\Token_Invariants.i"\
- "..\ace\Token_Request_Reply.h"\
- "..\ace\Token_Request_Reply.i"\
- "..\ace\Trace.h"\
- "..\ace\Version.h"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/UPIPE_SAP_Test.dsp b/tests/UPIPE_SAP_Test.dsp
index 3ab5f089035..7a5d6aa1890 100644
--- a/tests/UPIPE_SAP_Test.dsp
+++ b/tests/UPIPE_SAP_Test.dsp
@@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Console Application" 0x0103
# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-CFG=UPIPE_SAP_Test - Win32 Alpha Unicode Release
+CFG=UPIPE_SAP_Test - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -14,8 +14,7 @@ CFG=UPIPE_SAP_Test - Win32 Alpha Unicode Release
!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 "UPIPE_SAP_Test.mak"\
- CFG="UPIPE_SAP_Test - Win32 Alpha Unicode Release"
+!MESSAGE NMAKE /f "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -23,18 +22,6 @@ CFG=UPIPE_SAP_Test - Win32 Alpha Unicode Release
"Win32 (x86) Console Application")
!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Debug" (based on\
"Win32 (ALPHA) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 Unicode Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 Unicode Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Unicode Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Unicode Release" (based on\
- "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
@@ -83,8 +70,8 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "UPIPE_SAP_Test"
CPP=cl.exe
-# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -96,196 +83,12 @@ LINK32=link.exe
# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "UPIPE_SAP_Test\Debug"
-# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Release"
-# PROP Intermediate_Dir ".\DLL\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "UPIPE_SAP_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "UPIPE_SAP_Test\Unicode Debug"
-# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Debug"
-# PROP Intermediate_Dir ".\DLL\Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "UPIPE_SAP_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "UPIPE_SAP_Test\Unicode Release"
-# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL\Unicode_Release"
-# PROP Intermediate_Dir ".\DLL\Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "UPIPE_SAP_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib odbc32.lib odbccp32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib odbc32.lib odbccp32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /incremental:no /machine:I386 /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "UPIPE_SAP_Test\Alpha Release"
-# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Alpha Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Release"
-# PROP Intermediate_Dir "DLL/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "UPIPE_SAP_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "UPIPE_SAP_Test\Alpha Unicode Debug"
-# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Alpha Unicode Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Debug"
-# PROP Intermediate_Dir "DLL/Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "UPIPE_SAP_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-# ADD LINK32 wsock32.lib aceud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "UPIPE_SAP_Test\Alpha Unicode Release"
-# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Alpha Unicode Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir "UPIPE_SAP_Test"
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DLL/Unicode_Release"
-# PROP Intermediate_Dir "DLL/Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir "UPIPE_SAP_Test"
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /Zi /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UNICODE" /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 wsock32.lib aceu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\ace"
-# SUBTRACT LINK32 /debug
-
!ENDIF
# Begin Target
# Name "UPIPE_SAP_Test - Win32 Debug"
# Name "UPIPE_SAP_Test - Win32 Alpha Debug"
-# Name "UPIPE_SAP_Test - Win32 Release"
-# Name "UPIPE_SAP_Test - Win32 Unicode Debug"
-# Name "UPIPE_SAP_Test - Win32 Unicode Release"
-# Name "UPIPE_SAP_Test - Win32 Alpha Release"
-# Name "UPIPE_SAP_Test - Win32 Alpha Unicode Debug"
-# Name "UPIPE_SAP_Test - Win32 Alpha Unicode Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
@@ -424,272 +227,6 @@ DEP_CPP_UPIPE=\
".\test_config.h"\
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Release"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Unicode Debug"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Unicode Release"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Unicode Debug"
-
-DEP_CPP_UPIPE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SPIPE.h"\
- "..\ace\SPIPE.i"\
- "..\ace\SPIPE_Acceptor.h"\
- "..\ace\SPIPE_Addr.h"\
- "..\ace\SPIPE_Addr.i"\
- "..\ace\SPIPE_Stream.h"\
- "..\ace\SPIPE_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream.cpp"\
- "..\ace\Stream.h"\
- "..\ace\Stream.i"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\UPIPE_Acceptor.h"\
- "..\ace\UPIPE_Acceptor.i"\
- "..\ace\UPIPE_Addr.h"\
- "..\ace\UPIPE_Connector.h"\
- "..\ace\UPIPE_Connector.i"\
- "..\ace\UPIPE_Stream.h"\
- "..\ace\UPIPE_Stream.i"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
-!ELSEIF "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Unicode Release"
-
-DEP_CPP_UPIPE=\
- "..\ace\ACE.h"\
- "..\ace\ACE.i"\
- "..\ace\Addr.h"\
- "..\ace\Addr.i"\
- "..\ace\Atomic_Op.i"\
- "..\ace\Auto_Ptr.cpp"\
- "..\ace\Auto_Ptr.h"\
- "..\ace\Auto_Ptr.i"\
- "..\ace\config-win32-common.h"\
- "..\ace\config-win32.h"\
- "..\ace\config.h"\
- "..\ace\Containers.cpp"\
- "..\ace\Containers.h"\
- "..\ace\Containers.i"\
- "..\ace\Event_Handler.h"\
- "..\ace\Event_Handler.i"\
- "..\ace\Free_List.cpp"\
- "..\ace\Free_List.h"\
- "..\ace\Free_List.i"\
- "..\ace\Handle_Set.h"\
- "..\ace\Handle_Set.i"\
- "..\ace\Hash_Map_Manager.cpp"\
- "..\ace\Hash_Map_Manager.h"\
- "..\ace\IO_Cntl_Msg.h"\
- "..\ace\IPC_SAP.h"\
- "..\ace\IPC_SAP.i"\
- "..\ace\Log_Msg.h"\
- "..\ace\Log_Priority.h"\
- "..\ace\Log_Record.h"\
- "..\ace\Log_Record.i"\
- "..\ace\Malloc.h"\
- "..\ace\Malloc.i"\
- "..\ace\Malloc_T.cpp"\
- "..\ace\Malloc_T.h"\
- "..\ace\Malloc_T.i"\
- "..\ace\Managed_Object.cpp"\
- "..\ace\Managed_Object.h"\
- "..\ace\Managed_Object.i"\
- "..\ace\Mem_Map.h"\
- "..\ace\Mem_Map.i"\
- "..\ace\Memory_Pool.h"\
- "..\ace\Memory_Pool.i"\
- "..\ace\Message_Block.h"\
- "..\ace\Message_Block.i"\
- "..\ace\Message_Queue.cpp"\
- "..\ace\Message_Queue.h"\
- "..\ace\Message_Queue.i"\
- "..\ace\Module.cpp"\
- "..\ace\Module.h"\
- "..\ace\Module.i"\
- "..\ace\Object_Manager.h"\
- "..\ace\Object_Manager.i"\
- "..\ace\OS.h"\
- "..\ace\OS.i"\
- "..\ace\Reactor.h"\
- "..\ace\Reactor.i"\
- "..\ace\Reactor_Impl.h"\
- "..\ace\Service_Config.h"\
- "..\ace\Service_Config.i"\
- "..\ace\Service_Object.h"\
- "..\ace\Service_Object.i"\
- "..\ace\Service_Types.h"\
- "..\ace\Service_Types.i"\
- "..\ace\Shared_Object.h"\
- "..\ace\Shared_Object.i"\
- "..\ace\Signal.h"\
- "..\ace\Signal.i"\
- "..\ace\SPIPE.h"\
- "..\ace\SPIPE.i"\
- "..\ace\SPIPE_Acceptor.h"\
- "..\ace\SPIPE_Addr.h"\
- "..\ace\SPIPE_Addr.i"\
- "..\ace\SPIPE_Stream.h"\
- "..\ace\SPIPE_Stream.i"\
- "..\ace\SString.h"\
- "..\ace\SString.i"\
- "..\ace\stdcpp.h"\
- "..\ace\Strategies.h"\
- "..\ace\Strategies_T.cpp"\
- "..\ace\Strategies_T.h"\
- "..\ace\Stream.cpp"\
- "..\ace\Stream.h"\
- "..\ace\Stream.i"\
- "..\ace\Stream_Modules.cpp"\
- "..\ace\Stream_Modules.h"\
- "..\ace\Stream_Modules.i"\
- "..\ace\SV_Semaphore_Complex.h"\
- "..\ace\SV_Semaphore_Complex.i"\
- "..\ace\SV_Semaphore_Simple.h"\
- "..\ace\SV_Semaphore_Simple.i"\
- "..\ace\Svc_Conf_Tokens.h"\
- "..\ace\Synch.h"\
- "..\ace\Synch.i"\
- "..\ace\Synch_Options.h"\
- "..\ace\Synch_T.cpp"\
- "..\ace\Synch_T.h"\
- "..\ace\Synch_T.i"\
- "..\ace\Task.h"\
- "..\ace\Task.i"\
- "..\ace\Task_T.cpp"\
- "..\ace\Task_T.h"\
- "..\ace\Task_T.i"\
- "..\ace\Thread.h"\
- "..\ace\Thread.i"\
- "..\ace\Thread_Manager.h"\
- "..\ace\Thread_Manager.i"\
- "..\ace\Time_Value.h"\
- "..\ace\Timer_Queue.h"\
- "..\ace\Timer_Queue_T.cpp"\
- "..\ace\Timer_Queue_T.h"\
- "..\ace\Timer_Queue_T.i"\
- "..\ace\Trace.h"\
- "..\ace\UPIPE_Acceptor.h"\
- "..\ace\UPIPE_Acceptor.i"\
- "..\ace\UPIPE_Addr.h"\
- "..\ace\UPIPE_Connector.h"\
- "..\ace\UPIPE_Connector.i"\
- "..\ace\UPIPE_Stream.h"\
- "..\ace\UPIPE_Stream.i"\
- "..\ace\Version.h"\
- "..\ace\WFMO_Reactor.h"\
- "..\ace\WFMO_Reactor.i"\
- "..\ace\ws2tcpip.h"\
- ".\test_config.h"\
-
-
!ENDIF
# End Source File
diff --git a/tests/tests.dsw b/tests/tests.dsw
index 18f8f8f257d..2fd44b93832 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -375,6 +375,18 @@ Package=<4>
###############################################################################
+Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "SOCK_Test"=.\SOCK_Test.dsp - Package Owner=<4>
Package=<5>
View Lorry Controller Status