diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-21 21:39:47 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-21 21:39:47 +0000 |
| commit | 6de583e99404796703c97e8f178e0cf3dc54e928 (patch) | |
| tree | ff023d624f3588bdf25b9abe29267820a4aa6deb | |
| parent | 6bb778979a753450345a001c1f20f94b4d4d4261 (diff) | |
| download | ATCD-6de583e99404796703c97e8f178e0cf3dc54e928.tar.gz | |
ChangeLogTag:Wed Jan 21 15:38:52 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/Event_Service/GPlot_File.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/Event_Service/Makefile | 1 |
3 files changed, 10 insertions, 5 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 7b142440d76..c7a1b1e0572 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,9 @@ +Wed Jan 21 15:38:52 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/Event_Service/Makefile: + Removed GPlot_File from the list, it does not compile on + Solaris/g++, but it is not needed. + Wed Jan 21 11:48:19 1998 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> * tao/encode.cpp: Updated the ObjRef::encode routine to encode NUL diff --git a/TAO/orbsvcs/Event_Service/GPlot_File.cpp b/TAO/orbsvcs/Event_Service/GPlot_File.cpp index 926fc16537d..6967cc932fe 100644 --- a/TAO/orbsvcs/Event_Service/GPlot_File.cpp +++ b/TAO/orbsvcs/Event_Service/GPlot_File.cpp @@ -165,15 +165,15 @@ ACE_GPlot_File::set (long entry, float value) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Map_Entry<long, char *>; +template class ACE_Map_Manager<long, char *, ACE_Null_Mutex>; template class ACE_Map_Iterator_Base<long, char *, ACE_Null_Mutex>; template class ACE_Map_Iterator<long, char *, ACE_Null_Mutex>; template class ACE_Map_Reverse_Iterator<long, char *, ACE_Null_Mutex>; -template class ACE_Map_Manager<long, char *, ACE_Null_Mutex>; +template class ACE_Map_Entry<long, char *>; #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Map_Entry<long, char *> +#pragma instantiate ACE_Map_Manager<long, char *, ACE_Null_Mutex> #pragma instantiate ACE_Map_Iterator_Base<long, char *, ACE_Null_Mutex> #pragma instantiate ACE_Map_Iterator<long, char *, ACE_Null_Mutex> #pragma instantiate ACE_Map_Reverse_Iterator<long, char *, ACE_Null_Mutex> -#pragma instantiate ACE_Map_Manager<long, char *, ACE_Null_Mutex> +#pragma instantiate ACE_Map_Entry<long, char *> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile index a1b69ec958b..1cfda509b38 100644 --- a/TAO/orbsvcs/Event_Service/Makefile +++ b/TAO/orbsvcs/Event_Service/Makefile @@ -11,7 +11,6 @@ LSRC = \ CORBA_Utils_T.cpp \ Dispatching_Modules.cpp \ Event_Channel.cpp \ - GPlot_File.cpp \ Local_ESTypes.cpp \ Memory_Pools.cpp \ RT_Task.cpp \ |