ChangeLogTag:Mon Dec 23 12:13:51 2002 Steve Huston <shuston@riverace.com>

6 files changed, 13 insertions, 26 deletions

diff --git a/examples/C++NPv1/Process_Per_Connection_Logging_Server.h b/examples/C++NPv1/Process_Per_Connection_Logging_Server.h
index 393f74d06f9..4d64d764bfd 100644
--- a/examples/C++NPv1/Process_Per_Connection_Logging_Server.h
+++ b/examples/C++NPv1/Process_Per_Connection_Logging_Server.h
@@ -33,7 +33,7 @@ private:
 };
 
 
-class Process_Per_Connection_Logging_Server : Logging_Server
+class Process_Per_Connection_Logging_Server : public Logging_Server
 {
 protected:
   char prog_name_[MAXPATHLEN + 1];
diff --git a/examples/C++NPv2/Makefile b/examples/C++NPv2/Makefile
index ecca3fcac09..e9442f1d9d6 100644
--- a/examples/C++NPv2/Makefile
+++ b/examples/C++NPv2/Makefile
@@ -35,10 +35,12 @@ endif # ssl
 .NOTPARALLEL:
 
 ## Makefile.Reactive_Logging_Server.mkfile is a dummy target which will cause
-## $(MAKE) -f Makefile.Reactive_Logging_Server to be invoked
+## $(MAKE) -f Makefile.Reactive_Logging_Server to be invoked, then it cleans
+## up tempinc when needed for AIX Visual Age C++.
 %.mkfile: %
 	@echo $(MAKE) -f $< $(MKFILE_TARGET)
 	@$(MAKE) -f $< $(MKFILE_TARGET)
+	-@$(RM) -rf tempinc
 
 # This rule invokes make again with the list of .mkfile targets as a
 # parameter.  For example, if the all target is being made, make is invoked
diff --git a/examples/C++NPv2/Makefile.CLD b/examples/C++NPv2/Makefile.CLD
index 10bac2a15e5..9aae61a8f31 100644
--- a/examples/C++NPv2/Makefile.CLD
+++ b/examples/C++NPv2/Makefile.CLD
@@ -11,7 +11,8 @@
 SHLIB   = libCLD.$(SOEXT)
 FILES   = Client_Logging_Daemon \
           Logging_Acceptor \
-          Logging_Event_Handler
+          Logging_Event_Handler \
+          Logging_Handler
 LSRC    = $(addsuffix .cpp,$(FILES))
 
 LIBS   += $(ACELIB)
@@ -28,10 +29,3 @@ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# To remake the DLL_Test source with xlC on AIX, it works
-# best to wipe out any previously-created tempinc directory.
-# The compiler/linker isn't too smart about instantiating templates...
-ifdef TEMPINCDIR
-COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
-endif
diff --git a/examples/C++NPv2/Makefile.SLD b/examples/C++NPv2/Makefile.SLD
index 201a87139d6..8b9deed18c1 100644
--- a/examples/C++NPv2/Makefile.SLD
+++ b/examples/C++NPv2/Makefile.SLD
@@ -11,7 +11,8 @@
 SHLIB   = libSLD.$(SOEXT)
 FILES   = SLD \
           Logging_Acceptor \
-          Logging_Event_Handler
+          Logging_Event_Handler \
+          Logging_Handler
 LSRC    = $(addsuffix .cpp,$(FILES))
 
 LIBS   += $(ACELIB)
diff --git a/examples/C++NPv2/Makefile.SLDex b/examples/C++NPv2/Makefile.SLDex
index 89d037a59dd..384bffe05d3 100644
--- a/examples/C++NPv2/Makefile.SLDex
+++ b/examples/C++NPv2/Makefile.SLDex
@@ -10,7 +10,10 @@
 
 SHLIB   = libSLDex.$(SOEXT)
 FILES   = SLDex \
+          Logging_Acceptor \
+          Logging_Event_Handler \
           Logging_Event_Handler_Ex \
+          Logging_Handler \
           Server_Shutdown
 LSRC    = $(addsuffix .cpp,$(FILES))
 
@@ -28,10 +31,3 @@ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# To remake the DLL_Test source with xlC on AIX, it works
-# best to wipe out any previously-created tempinc directory.
-# The compiler/linker isn't too smart about instantiating templates...
-ifdef TEMPINCDIR
-COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
-endif
diff --git a/examples/C++NPv2/Makefile.TPLS b/examples/C++NPv2/Makefile.TPLS
index 1af0250e515..c6014063323 100644
--- a/examples/C++NPv2/Makefile.TPLS
+++ b/examples/C++NPv2/Makefile.TPLS
@@ -11,7 +11,8 @@
 SHLIB   = libTPLS.$(SOEXT)
 FILES   = TP_Logging_Server \
           Logging_Acceptor \
-          Logging_Event_Handler
+          Logging_Event_Handler \
+          Logging_Handler
 LSRC    = $(addsuffix .cpp,$(FILES))
 
 LIBS   += $(ACELIB)
@@ -28,10 +29,3 @@ include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# To remake the DLL_Test source with xlC on AIX, it works
-# best to wipe out any previously-created tempinc directory.
-# The compiler/linker isn't too smart about instantiating templates...
-ifdef TEMPINCDIR
-COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
-endif