diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-06-07 18:48:18 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2003-06-07 18:48:18 +0000 |
| commit | d09b3386036f10ae2279c6c1f0af3a626283b2c4 (patch) | |
| tree | f39f5bab7ececae705a248175d058be17ff56797 | |
| parent | e9c833fef1fe4a2f8e65113c44492bacb5ff83a6 (diff) | |
| download | ATCD-d09b3386036f10ae2279c6c1f0af3a626283b2c4.tar.gz | |
ChangeLogTag:Sat Jun 7 11:12:16 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_tmplinst.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Operation_Table.cpp | 3 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h | 1 |
6 files changed, 25 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 5c10afe18fd..044e6d0fe8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jun 7 11:12:16 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h: Added a + #include for "ace/Atomic_Op.h" to solve a compilation problem. + Thanks to Nick Kukuczka <nickk@appliedepi.com> for reporting + this. + Fri Jun 6 09:31:21 2003 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/ProjectCreator.pm: diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 88c41a74b42..80305d8d109 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sat Jun 7 13:45:38 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * tao/PortableServer/Operation_Table.cpp: + * TAO_IDL/be/be_tmplinst.cpp: HP/UX and GCC do some weird things, + so it's necessary to explicitly instantiate all static template + singletons, even when using automatic template instantiation! + Thanks to Stan Sosnovsky <sosnovsky_stan@emc.com> for reporting + this. + Sat Jun 07 09:34:48 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp: diff --git a/TAO/TAO_IDL/be/be_tmplinst.cpp b/TAO/TAO_IDL/be/be_tmplinst.cpp index e63888d6b69..cb8af2fd705 100644 --- a/TAO/TAO_IDL/be/be_tmplinst.cpp +++ b/TAO/TAO_IDL/be/be_tmplinst.cpp @@ -52,5 +52,9 @@ template class ACE_Unbounded_Queue_Iterator <be_interface_fwd *>; #pragma instantiate ACE_Unbounded_Queue <be_interface_fwd *> #pragma instantiate ACE_Unbounded_Queue_Iterator <be_interface_fwd *> +#elif defined (__GNUC__) && defined (__hpux) +template class ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX>; +template class ACE_Singleton<TAO_OutStream_Factory,ACE_SYNCH_RECURSIVE_MUTEX>; +template class ACE_Singleton<TAO_Visitor_Factory,ACE_SYNCH_RECURSIVE_MUTEX>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index b1a4e99f340..a47920a1c7c 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -385,4 +385,7 @@ template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, #pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Entry<const char *, TAO_Skeleton> #pragma instantiate TAO_Singleton<TAO_Operation_Table_Parameters, TAO_SYNCH_RECURSIVE_MUTEX> + +#elif defined (__GNUC__) && defined (__hpux) +template class TAO_Singleton<TAO_Operation_Table_Parameters,TAO_SYNCH_RECURSIVE_MUTEX>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ @@ -1713,6 +1713,7 @@ Branko Mijic <bmijic@hotmail.com> Jeff Kelley <jeffkelley@micron.com> Daniel Hannum <daniel.hannum@siemens.com> Jason Cohen <jcohen@atl.lmco.com> +Nick Kukuczka <nickk@appliedepi.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h b/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h index 915882f132e..ef5620c0a94 100644 --- a/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h +++ b/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.h @@ -15,6 +15,7 @@ # include "ace/Service_Repository.h" # include "ace/Synch.h" # include "ace/Service_Types.h" +# include "ace/Atomic_Op.h" # include "export_mac.h" # if defined (ACE_HAS_THREADS) |