From f428c301c68d6436dfdffb1115bc4f5a7ce31cef Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Mon, 30 Dec 2002 23:46:24 +0000 Subject: ChangeLogTag:Mon Dec 30 18:44:20 Steve Huston --- ChangeLog | 12 ++++++++++++ ChangeLogs/ChangeLog-03a | 12 ++++++++++++ examples/C++NPv2/TP_Logging_Server.cpp | 5 +++++ examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp | 3 +++ examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp | 3 +++ examples/Logger/Acceptor-server/server_loggerd.cpp | 7 +++++++ examples/Logger/simple-server/server_loggerd.cpp | 4 +++- examples/Threads/auto_event.cpp | 4 +++- examples/Threads/tss2.cpp | 3 +++ performance-tests/Misc/test_singleton.cpp | 3 +++ 10 files changed, 54 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4e4549e4da..cc249758b48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon Dec 30 18:44:20 Steve Huston + + * examples/C++NPv2/TP_Logging_Server.cpp: + * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: + * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: + * examples/Logger/Acceptor-server/server_loggerd.cpp: + * examples/Logger/simple-server/server_loggerd.cpp: + * examples/Threads/auto_event.cpp: + * examples/Threads/tss2.cpp: + * performance-tests/Misc/test_singleton.cpp: + More singleton_ instantiations for g++ on AIX. + Mon Dec 30 18:11:39 2002 Steve Huston * apps/drwho/File_Manager.cpp: Add explicit instantiation of diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index e4e4549e4da..cc249758b48 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,15 @@ +Mon Dec 30 18:44:20 Steve Huston + + * examples/C++NPv2/TP_Logging_Server.cpp: + * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: + * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp: + * examples/Logger/Acceptor-server/server_loggerd.cpp: + * examples/Logger/simple-server/server_loggerd.cpp: + * examples/Threads/auto_event.cpp: + * examples/Threads/tss2.cpp: + * performance-tests/Misc/test_singleton.cpp: + More singleton_ instantiations for g++ on AIX. + Mon Dec 30 18:11:39 2002 Steve Huston * apps/drwho/File_Manager.cpp: Add explicit instantiation of diff --git a/examples/C++NPv2/TP_Logging_Server.cpp b/examples/C++NPv2/TP_Logging_Server.cpp index 99ca486d740..251179032a9 100644 --- a/examples/C++NPv2/TP_Logging_Server.cpp +++ b/examples/C++NPv2/TP_Logging_Server.cpp @@ -66,4 +66,9 @@ ACE_FACTORY_DEFINE (TPLS, TP_Logging_Server) template class Reactor_Logging_Server; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate Reactor_Logging_Server +#elif defined (__GNUC__) && defined (_AIX) +template ACE_Singleton * + ACE_Singleton::singleton_; +template ACE_Unmanaged_Singleton * + ACE_Unmanaged_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index a0889dd7f32..fe6e0dbc906 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -420,4 +420,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) template class ACE_Singleton; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Singleton +#elif defined (__GNUC__) && defined (_AIX) +template ACE_Singleton * + ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp index 9e1356c45cd..ff3c5d78531 100644 --- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp +++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp @@ -581,4 +581,7 @@ template class ACE_Svc_Handler; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Singleton #pragma instantiate ACE_Svc_Handler +#elif defined (__GNUC__) && defined (_AIX) +template ACE_Singleton * + ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp index 136bb29c2ec..da1591602f3 100644 --- a/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -228,4 +228,11 @@ template class ACE_Test_and_Set; #pragma instantiate ACE_Singleton #pragma instantiate ACE_Svc_Handler #pragma instantiate ACE_Test_and_Set +#elif defined (__GNUC__) && defined (_AIX) +template ACE_Singleton * + ACE_Singleton::singleton_; +template ACE_Singleton * + ACE_Singleton::singleton_; +template ACE_Singleton, ACE_Null_Mutex> * + ACE_Singleton, ACE_Null_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/examples/Logger/simple-server/server_loggerd.cpp b/examples/Logger/simple-server/server_loggerd.cpp index d35c6c8eb15..aaef80e5406 100644 --- a/examples/Logger/simple-server/server_loggerd.cpp +++ b/examples/Logger/simple-server/server_loggerd.cpp @@ -82,5 +82,7 @@ main (int argc, char *argv[]) template class ACE_Singleton; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Singleton +#elif defined (__GNUC__) && defined (_AIX) +template ACE_Singleton * + ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - diff --git a/examples/Threads/auto_event.cpp b/examples/Threads/auto_event.cpp index 24260940a67..30640e8791a 100644 --- a/examples/Threads/auto_event.cpp +++ b/examples/Threads/auto_event.cpp @@ -106,6 +106,9 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) template class ACE_Singleton; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Singleton +#elif defined (__GNUC__) && defined (_AIX) +template ACE_Singleton * + ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -117,4 +120,3 @@ ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } #endif /* ACE_HAS_THREADS */ - diff --git a/examples/Threads/tss2.cpp b/examples/Threads/tss2.cpp index 4cc9a7198a0..b74b605b30a 100644 --- a/examples/Threads/tss2.cpp +++ b/examples/Threads/tss2.cpp @@ -193,6 +193,9 @@ template class ACE_TSS_Singleton; #pragma instantiate ACE_TSS #pragma instantiate ACE_TSS #pragma instantiate ACE_TSS_Singleton +#elif defined (__GNUC__) && defined (_AIX) +template ACE_TSS_Singleton * + ACE_TSS_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/performance-tests/Misc/test_singleton.cpp b/performance-tests/Misc/test_singleton.cpp index bd76d58926a..c4bc7a6d7a5 100644 --- a/performance-tests/Misc/test_singleton.cpp +++ b/performance-tests/Misc/test_singleton.cpp @@ -165,6 +165,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) template class ACE_Singleton; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Singleton +#elif defined (__GNUC__) && defined (_AIX) +template ACE_Singleton * + ACE_Singleton::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -- cgit v1.2.1