ChangeLogTag:Thu Oct 17 20:02:39 2002 Steve Huston <shuston@riverace.com>

5 files changed, 33 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c038cdc62b..f7296d07da9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Oct 17 20:02:39 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp:
+        * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp:
+        * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp:
+          Add extern "C" to the signal handler function declaration to conform
+          strictly to its definition.
+          When explicitly instantiating auto_ptr<>, fully specify the
+          Thread_Args type else modern compilers (Forte 7) can't see it.
+
 Thu Oct 17 17:32:39 2002  Krishnakumar B  <kitty@cse.wustl.edu>
 
         * ACEXML/examples/svcconf/Svcconf_Handler.cpp:
@@ -14,8 +24,9 @@ Thu Oct 17 19:18:02 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
 	   - Removed definitions:
 	      ACE_HAS_MACOSX_DYLIB, ACE_LACKS_SEMBUF_T
 	   - Added definitions:
-	     ACE_HAS_SEMUN, #define ACE_HAS_SIGINFO_T, #define ACE_LACKS_SIGINFO_H,
-	     ACE_HAS_UCONTEXT_T, ACE_HAS_GETIFADDRS, ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+	     ACE_HAS_SEMUN, ACE_HAS_SIGINFO_T, ACE_LACKS_SIGINFO_H,
+	     ACE_HAS_UCONTEXT_T, ACE_HAS_GETIFADDRS,
+             ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 	   - Defined ACE_HAS_POSITION_INDEPENDENT_POINTERS to 0 for temporary
 	     Apple gcc bug workaround.
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 9c038cdc62b..f7296d07da9 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Thu Oct 17 20:02:39 2002  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp:
+        * examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp:
+        * examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp:
+          Add extern "C" to the signal handler function declaration to conform
+          strictly to its definition.
+          When explicitly instantiating auto_ptr<>, fully specify the
+          Thread_Args type else modern compilers (Forte 7) can't see it.
+
 Thu Oct 17 17:32:39 2002  Krishnakumar B  <kitty@cse.wustl.edu>
 
         * ACEXML/examples/svcconf/Svcconf_Handler.cpp:
@@ -14,8 +24,9 @@ Thu Oct 17 19:18:02 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
 	   - Removed definitions:
 	      ACE_HAS_MACOSX_DYLIB, ACE_LACKS_SEMBUF_T
 	   - Added definitions:
-	     ACE_HAS_SEMUN, #define ACE_HAS_SIGINFO_T, #define ACE_LACKS_SIGINFO_H,
-	     ACE_HAS_UCONTEXT_T, ACE_HAS_GETIFADDRS, ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+	     ACE_HAS_SEMUN, ACE_HAS_SIGINFO_T, ACE_LACKS_SIGINFO_H,
+	     ACE_HAS_UCONTEXT_T, ACE_HAS_GETIFADDRS,
+             ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
 	   - Defined ACE_HAS_POSITION_INDEPENDENT_POINTERS to 0 for temporary
 	     Apple gcc bug workaround.
 
diff --git a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
index 2784419a978..14df8727687 100644
--- a/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp
@@ -13,7 +13,7 @@
 
 #include <errno.h>
 
-static void sigterm_handler (int /* signum */) { /* No-op. */ }
+extern "C" static void sigterm_handler (int /* signum */) { /* No-op. */ }
 
 
 Logging_Process::Logging_Process (const char *prog_name,
diff --git a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
index 09b48d6fffe..7f57fd51c4f 100644
--- a/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/RT_Thread_Per_Connection_Logging_Server.cpp
@@ -16,7 +16,7 @@
 
 #include <errno.h>
 
-static void sigterm_handler (int /* signum */) { /* No-op. */ }
+extern "C" static void sigterm_handler (int /* signum */) { /* No-op. */ }
 
 
 int
@@ -129,7 +129,7 @@ int main (int argc, char *argv[])
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<Thread_Args>;
+template class auto_ptr<Thread_Per_Connection_Logging_Server::Thread_Args>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<Thread_Args>
+#pragma instantiate auto_ptr<Thread_Per_Connection_Logging_Server::Thread_Args>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
index 719453fc811..1ec7bd32e29 100644
--- a/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
+++ b/examples/C++NPv1/Thread_Per_Connection_Logging_Server.cpp
@@ -15,7 +15,7 @@
 
 #include <errno.h>
 
-static void sigterm_handler (int /* signum */) { /* No-op. */ }
+extern "C" static void sigterm_handler (int /* signum */) { /* No-op. */ }
 
 ACE_THR_FUNC_RETURN Thread_Per_Connection_Logging_Server::run_svc (void *arg)
 {
@@ -89,7 +89,7 @@ int main (int argc, char *argv[])
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<Thread_Args>;
+template class auto_ptr<Thread_Per_Connection_Logging_Server::Thread_Args>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<Thread_Args>
+#pragma instantiate auto_ptr<Thread_Per_Connection_Logging_Server::Thread_Args>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */