diff options
| author | Steve Huston <shuston@riverace.com> | 2003-01-03 23:01:38 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2003-01-03 23:01:38 +0000 |
| commit | c7118d1f6ee47a58ce82ad2bec0dbfbdfe4d0f79 (patch) | |
| tree | 69babc171ca6c5ecae77dfb96f372b53a18ddbab | |
| parent | c0a30925101c9053c42369452d298d05a9d9bd01 (diff) | |
| download | ATCD-c7118d1f6ee47a58ce82ad2bec0dbfbdfe4d0f79.tar.gz | |
ChangeLogTag:Fri Jan 3 17:58:21 2003 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | ace/SSL/SSL_Context.cpp | 2 | ||||
| -rw-r--r-- | netsvcs/lib/Name_Handler.cpp | 2 | ||||
| -rw-r--r-- | netsvcs/lib/Server_Logging_Handler.cpp | 2 |
5 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 6025383e3a2..8346487407f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Jan 3 17:58:21 2003 Steve Huston <shuston@riverace.com> + + * ace/SSL/SSL_Context.cpp: + * netsvcs/lib/Name_Handler.cpp: + * netsvcs/lib/Server_Logging_Handler.cpp: Add __hpux to condition + where template members are explicitly instantiated. Also see: + Tue Dec 3 20:47:39 2002 Steve Huston <shuston@riverace.com> + Fri Jan 3 17:45:29 2003 Steve Huston <shuston@riverace.com> * include/makeinclude/platform_hpux_gcc.GNU: Use HP's /usr/bin/ar diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 6025383e3a2..8346487407f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Fri Jan 3 17:58:21 2003 Steve Huston <shuston@riverace.com> + + * ace/SSL/SSL_Context.cpp: + * netsvcs/lib/Name_Handler.cpp: + * netsvcs/lib/Server_Logging_Handler.cpp: Add __hpux to condition + where template members are explicitly instantiated. Also see: + Tue Dec 3 20:47:39 2002 Steve Huston <shuston@riverace.com> + Fri Jan 3 17:45:29 2003 Steve Huston <shuston@riverace.com> * include/makeinclude/platform_hpux_gcc.GNU: Use HP's /usr/bin/ar diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index 53d294ec6a7..59c1dd6c90b 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -524,7 +524,7 @@ template class ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>; #pragma instantiate ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> -#elif defined (__GNUC__) && defined (_AIX) +#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) template ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> * ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::singleton_; diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp index 917f60dd3dc..3c107d2229b 100644 --- a/netsvcs/lib/Name_Handler.cpp +++ b/netsvcs/lib/Name_Handler.cpp @@ -28,7 +28,7 @@ template class ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOCK_ACCEPTOR>; #pragma instantiate ACE_Schedule_All_Reactive_Strategy<ACE_Name_Handler> #pragma instantiate ACE_Scheduling_Strategy<ACE_Name_Handler> #pragma instantiate ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOCK_ACCEPTOR> -#elif defined (__GNUC__) && defined (_AIX) +#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) template ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX> * ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp index 2a595aca13a..1dcd2cbc648 100644 --- a/netsvcs/lib/Server_Logging_Handler.cpp +++ b/netsvcs/lib/Server_Logging_Handler.cpp @@ -237,7 +237,7 @@ template class ACE_Thr_Server_Logging_Handler<Synch_Receiver>; // That specialization is in TS_Server_Handler.cpp, so we don't need it // here. #endif /* ACE_HAS_TLI */ -#elif defined (__GNUC__) && defined (_AIX) +#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) template ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, |