*** empty log message ***

2 files changed, 183 insertions, 17 deletions

diff --git a/examples/Naming/Naming.mak b/examples/Naming/Naming.mak
index d7ff3a62181..69c269fb7db 100644
--- a/examples/Naming/Naming.mak
+++ b/examples/Naming/Naming.mak
@@ -4,17 +4,18 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

 !IF "$(CFG)" == ""

-CFG=non_existent - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to non_existent - Win32 Debug.

+CFG=open - Win32 Debug

+!MESSAGE No configuration specified.  Defaulting to open - Win32 Debug.

 !ENDIF 

 

 !IF "$(CFG)" != "writers - Win32 Debug" && "$(CFG)" !=\

- "multiple_contexts - Win32 Debug" && "$(CFG)" != "non_existent - Win32 Debug"

+ "multiple_contexts - Win32 Debug" && "$(CFG)" != "non_existent - Win32 Debug"\

+ && "$(CFG)" != "open - Win32 Debug"

 !MESSAGE Invalid configuration "$(CFG)" specified.

 !MESSAGE You can specify a configuration when running NMAKE on this makefile

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

 !MESSAGE 

-!MESSAGE NMAKE /f "Naming.mak" CFG="non_existent - Win32 Debug"

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

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -23,6 +24,7 @@ CFG=non_existent - Win32 Debug
  "Win32 (x86) Console Application")

 !MESSAGE "non_existent - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

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

 !MESSAGE 

 !ERROR An invalid configuration is specified.

 !ENDIF 

@@ -71,8 +73,8 @@ CLEAN :
 

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

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

-CPP_OBJS=.\debug/

-CPP_SBRS=.\.

+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

+ /Fp"$(INTDIR)/writers.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

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

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

 BSC32=bscmake.exe

@@ -129,8 +131,8 @@ CLEAN :
 

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

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

-CPP_OBJS=.\debug/

-CPP_SBRS=.\.

+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

+ /Fp"$(INTDIR)/multiple_contexts.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

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

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

 BSC32=bscmake.exe

@@ -188,8 +190,8 @@ CLEAN :
 

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

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

-CPP_OBJS=.\debug/

-CPP_SBRS=.\.

+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

+ /Fp"$(INTDIR)/non_existent.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

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

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

 BSC32=bscmake.exe

@@ -214,10 +216,68 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)

 <<

 

-!ENDIF 

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "open\Debug"

+# PROP BASE Intermediate_Dir "open\Debug"

+# PROP BASE Target_Dir "open"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "."

+# PROP Intermediate_Dir "Debug"

+# PROP Target_Dir "open"

+OUTDIR=.\.

+INTDIR=.\Debug

+

+ALL : "$(OUTDIR)\open.exe"

+

+CLEAN : 

+	-@erase "$(INTDIR)\test_open.obj"

+	-@erase "$(INTDIR)\vc40.idb"

+	-@erase "$(INTDIR)\vc40.pdb"

+	-@erase "$(OUTDIR)\open.exe"

+	-@erase "$(OUTDIR)\open.ilk"

+	-@erase "$(OUTDIR)\open.pdb"

+

+"$(OUTDIR)" :

+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

 

+"$(INTDIR)" :

+    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

+

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

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

- /Fp"$(INTDIR)/writers.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

+ /Fp"$(INTDIR)/open.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+BSC32_FLAGS=/nologo /o"$(OUTDIR)/open.bsc" 

+BSC32_SBRS= \

+	

+LINK32=link.exe

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

+# 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

+LINK32_FLAGS=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 /incremental:yes\

+ /pdb:"$(OUTDIR)/open.pdb" /debug /machine:I386 /out:"$(OUTDIR)/open.exe" 

+LINK32_OBJS= \

+	"$(INTDIR)\test_open.obj"

+

+"$(OUTDIR)\open.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

+    $(LINK32) @<<

+  $(LINK32_FLAGS) $(LINK32_OBJS)

+<<

+

+!ENDIF 

+

+CPP_OBJS=.\debug/

+CPP_SBRS=.\.

 

 .c{$(CPP_OBJS)}.obj:

    $(CPP) $(CPP_PROJ) $<  

@@ -336,6 +396,7 @@ DEP_CPP_TEST_=\
 	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

+	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

 

@@ -352,9 +413,6 @@ DEP_CPP_TEST_=\
 # Begin Source File

 

 SOURCE=.\test_multiple_contexts.cpp

-

-!IF  "$(CFG)" == "multiple_contexts - Win32 Debug"

-

 DEP_CPP_TEST_M=\

 	"..\..\ace\config-win32.h"\

 	{$(INCLUDE)}"\ace\ACE.h"\

@@ -446,6 +504,7 @@ DEP_CPP_TEST_M=\
 	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

+	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

 

@@ -453,8 +512,6 @@ DEP_CPP_TEST_M=\
  "$(INTDIR)"

 

 

-!ENDIF 

-

 # End Source File

 # End Target

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

@@ -556,6 +613,7 @@ DEP_CPP_TEST_N=\
 	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

+	{$(INCLUDE)}"\ace\Version.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

 

@@ -564,5 +622,113 @@ DEP_CPP_TEST_N=\
 

 # End Source File

 # End Target

+################################################################################

+# Begin Target

+

+# Name "open - Win32 Debug"

+################################################################################

+# Begin Source File

+

+SOURCE=.\test_open.cpp

+DEP_CPP_TEST_O=\

+	"..\..\ace\config-win32.h"\

+	{$(INCLUDE)}"\ace\ACE.h"\

+	{$(INCLUDE)}"\ace\ACE.i"\

+	{$(INCLUDE)}"\ace\Addr.h"\

+	{$(INCLUDE)}"\ace\Addr.i"\

+	{$(INCLUDE)}"\ace\Atomic_Op.i"\

+	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

+	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

+	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\config-win32-common.h"\

+	{$(INCLUDE)}"\ace\config.h"\

+	{$(INCLUDE)}"\ace\Containers.cpp"\

+	{$(INCLUDE)}"\ace\Containers.h"\

+	{$(INCLUDE)}"\ace\Containers.i"\

+	{$(INCLUDE)}"\ace\Event_Handler.h"\

+	{$(INCLUDE)}"\ace\Event_Handler.i"\

+	{$(INCLUDE)}"\ace\Free_List.cpp"\

+	{$(INCLUDE)}"\ace\Free_List.h"\

+	{$(INCLUDE)}"\ace\Free_List.i"\

+	{$(INCLUDE)}"\ace\Handle_Set.h"\

+	{$(INCLUDE)}"\ace\Handle_Set.i"\

+	{$(INCLUDE)}"\ace\INET_Addr.h"\

+	{$(INCLUDE)}"\ace\INET_Addr.i"\

+	{$(INCLUDE)}"\ace\IPC_SAP.h"\

+	{$(INCLUDE)}"\ace\IPC_SAP.i"\

+	{$(INCLUDE)}"\ace\Log_Msg.h"\

+	{$(INCLUDE)}"\ace\Log_Priority.h"\

+	{$(INCLUDE)}"\ace\Log_Record.h"\

+	{$(INCLUDE)}"\ace\Log_Record.i"\

+	{$(INCLUDE)}"\ace\Malloc.h"\

+	{$(INCLUDE)}"\ace\Malloc.i"\

+	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

+	{$(INCLUDE)}"\ace\Malloc_T.h"\

+	{$(INCLUDE)}"\ace\Malloc_T.i"\

+	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

+	{$(INCLUDE)}"\ace\Managed_Object.h"\

+	{$(INCLUDE)}"\ace\Managed_Object.i"\

+	{$(INCLUDE)}"\ace\Mem_Map.h"\

+	{$(INCLUDE)}"\ace\Mem_Map.i"\

+	{$(INCLUDE)}"\ace\Memory_Pool.h"\

+	{$(INCLUDE)}"\ace\Memory_Pool.i"\

+	{$(INCLUDE)}"\ace\Name_Proxy.h"\

+	{$(INCLUDE)}"\ace\Name_Request_Reply.h"\

+	{$(INCLUDE)}"\ace\Name_Space.h"\

+	{$(INCLUDE)}"\ace\Naming_Context.h"\

+	{$(INCLUDE)}"\ace\Object_Manager.h"\

+	{$(INCLUDE)}"\ace\Object_Manager.i"\

+	{$(INCLUDE)}"\ace\OS.h"\

+	{$(INCLUDE)}"\ace\OS.i"\

+	{$(INCLUDE)}"\ace\Reactor.h"\

+	{$(INCLUDE)}"\ace\Reactor.i"\

+	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

+	{$(INCLUDE)}"\ace\Service_Config.h"\

+	{$(INCLUDE)}"\ace\Service_Config.i"\

+	{$(INCLUDE)}"\ace\Service_Object.h"\

+	{$(INCLUDE)}"\ace\Service_Object.i"\

+	{$(INCLUDE)}"\ace\Shared_Object.h"\

+	{$(INCLUDE)}"\ace\Shared_Object.i"\

+	{$(INCLUDE)}"\ace\Signal.h"\

+	{$(INCLUDE)}"\ace\Signal.i"\

+	{$(INCLUDE)}"\ace\SOCK.h"\

+	{$(INCLUDE)}"\ace\SOCK.i"\

+	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

+	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

+	{$(INCLUDE)}"\ace\SOCK_IO.h"\

+	{$(INCLUDE)}"\ace\SOCK_IO.i"\

+	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

+	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

+	{$(INCLUDE)}"\ace\SString.h"\

+	{$(INCLUDE)}"\ace\SString.i"\

+	{$(INCLUDE)}"\ace\stdcpp.h"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

+	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

+	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

+	{$(INCLUDE)}"\ace\Synch.h"\

+	{$(INCLUDE)}"\ace\Synch.i"\

+	{$(INCLUDE)}"\ace\Synch_Options.h"\

+	{$(INCLUDE)}"\ace\Synch_T.cpp"\

+	{$(INCLUDE)}"\ace\Synch_T.h"\

+	{$(INCLUDE)}"\ace\Synch_T.i"\

+	{$(INCLUDE)}"\ace\Thread.h"\

+	{$(INCLUDE)}"\ace\Thread.i"\

+	{$(INCLUDE)}"\ace\Time_Value.h"\

+	{$(INCLUDE)}"\ace\Timer_Queue.h"\

+	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

+	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

+	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

+	{$(INCLUDE)}"\ace\Trace.h"\

+	{$(INCLUDE)}"\ace\Version.h"\

+	{$(INCLUDE)}"\ace\ws2tcpip.h"\

+	

+

+"$(INTDIR)\test_open.obj" : $(SOURCE) $(DEP_CPP_TEST_O) "$(INTDIR)"

+

+

+# End Source File

+# End Target

 # End Project

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

diff --git a/examples/Naming/Naming.mdp b/examples/Naming/Naming.mdp
index 92fa24ffd20..c36884999d0 100644
--- a/examples/Naming/Naming.mdp
+++ b/examples/Naming/Naming.mdp