diff options
| -rw-r--r-- | ChangeLog-97b | 21 | ||||
| -rw-r--r-- | ace/Timer_Hash.cpp | 4 | ||||
| -rw-r--r-- | ace/Timer_Hash_T.h | 4 | ||||
| -rw-r--r-- | ace/Timer_Heap.cpp | 4 | ||||
| -rw-r--r-- | ace/Timer_Heap_T.h | 4 | ||||
| -rw-r--r-- | ace/Timer_List.cpp | 4 | ||||
| -rw-r--r-- | ace/Timer_List_T.h | 4 | ||||
| -rw-r--r-- | ace/Timer_Queue.cpp | 4 | ||||
| -rw-r--r-- | ace/Timer_Queue_Adapters.h | 2 | ||||
| -rw-r--r-- | ace/Timer_Queue_Adapters.i | 2 | ||||
| -rw-r--r-- | ace/Timer_Queue_T.h | 4 | ||||
| -rw-r--r-- | ace/Timer_Wheel.cpp | 4 | ||||
| -rw-r--r-- | ace/Timer_Wheel_T.h | 4 |
13 files changed, 53 insertions, 12 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index e1a5212cfad..33c610d4c02 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,3 +1,24 @@ +Fri Oct 17 21:58:04 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> + + * ace/Timer_Queue_Adapters.h: + * ace/Timer_Queue_Adapters.i: + Changed the method name from lock() to mutex(), this should + workaround a bug in the HP/C++ compiler. + + * ace/Timer_Hash.cpp: + * ace/Timer_Hash_T.h: + * ace/Timer_Heap.cpp: + * ace/Timer_Heap_T.h: + * ace/Timer_List.cpp: + * ace/Timer_List_T.h: + * ace/Timer_Queue.cpp: + * ace/Timer_Queue_T.h: + * ace/Timer_Wheel.cpp: + * ace/Timer_Wheel_T.h: + Workaround HP/C++ compiler bug, we cannot include the .cpp file + from the header file, but it must be included in the point of + instantiation. + Fri Oct 17 18:34:00 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> * ace/Atomic_Op.i (lock): Added an accessor to ACE_Atomic_Op to diff --git a/ace/Timer_Hash.cpp b/ace/Timer_Hash.cpp index 6482e1051d7..860f9a84fe3 100644 --- a/ace/Timer_Hash.cpp +++ b/ace/Timer_Hash.cpp @@ -10,6 +10,10 @@ #include "ace/config.h" #include "ace/Timer_Hash.h" +#if defined (ACE_HPUX_BROKEN_TEMPLATES) +#include "ace/Timer_Hash_T.cpp" +#endif /* ACE_HPUX_BROKEN_TEMPLATES */ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Free_List<ACE_Timer_Node_T<ACE_Event_Handler *> >; template class ACE_Locked_Free_List<ACE_Timer_Node_T<ACE_Event_Handler *>, diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h index 9c2dd0f9578..d95c2718300 100644 --- a/ace/Timer_Hash_T.h +++ b/ace/Timer_Hash_T.h @@ -230,9 +230,9 @@ private: ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET> &)) }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HPUX_BROKEN_TEMPLATES) #include "ace/Timer_Hash_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HPUX_BROKEN_TEMPLATES */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Timer_Hash_T.cpp") diff --git a/ace/Timer_Heap.cpp b/ace/Timer_Heap.cpp index 7f18e85a699..d0f970c0463 100644 --- a/ace/Timer_Heap.cpp +++ b/ace/Timer_Heap.cpp @@ -8,6 +8,10 @@ #include "ace/config.h" #include "ace/Timer_Heap.h" +#if defined (ACE_HPUX_BROKEN_TEMPLATES) +#include "ace/Timer_Heap_T.cpp" +#endif /* ACE_HPUX_BROKEN_TEMPLATES */ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>; template class ACE_Timer_Heap_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>; diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h index 7f6d6c26040..e6affbd61bf 100644 --- a/ace/Timer_Heap_T.h +++ b/ace/Timer_Heap_T.h @@ -252,9 +252,9 @@ private: ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &)) }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HPUX_BROKEN_TEMPLATES) #include "ace/Timer_Heap_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HPUX_BROKEN_TEMPLATES */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Timer_Heap_T.cpp") diff --git a/ace/Timer_List.cpp b/ace/Timer_List.cpp index 8bae22eb456..8b221045d0d 100644 --- a/ace/Timer_List.cpp +++ b/ace/Timer_List.cpp @@ -8,6 +8,10 @@ #include "ace/config.h" #include "ace/Timer_List.h" +#if defined (ACE_HPUX_BROKEN_TEMPLATES) +#include "ace/Timer_List_T.cpp" +#endif /* ACE_HPUX_BROKEN_TEMPLATES */ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Timer_List_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>; template class ACE_Timer_List_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>; diff --git a/ace/Timer_List_T.h b/ace/Timer_List_T.h index c15a5d900fd..31dbda9ebf3 100644 --- a/ace/Timer_List_T.h +++ b/ace/Timer_List_T.h @@ -174,9 +174,9 @@ private: ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK> &)) }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined(ACE_HPUX_BROKEN_TEMPLATES) #include "ace/Timer_List_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HPUX_BROKEN_TEMPLATES */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Timer_List_T.cpp") diff --git a/ace/Timer_Queue.cpp b/ace/Timer_Queue.cpp index ff6471efdf8..9957d730563 100644 --- a/ace/Timer_Queue.cpp +++ b/ace/Timer_Queue.cpp @@ -9,6 +9,10 @@ #include "ace/Containers.h" #include "ace/Timer_Queue.h" +#if defined (ACE_HPUX_BROKEN_TEMPLATES) +#include "ace/Timer_Queue_T.cpp" +#endif /* ACE_HPUX_BROKEN_TEMPLATES */ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Unbounded_Set<ACE_Timer_Node_T<ACE_Event_Handler *> *>; template class ACE_Node<ACE_Timer_Node_T<ACE_Event_Handler *> *>; diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h index a5d6009b386..4c98d733ee1 100644 --- a/ace/Timer_Queue_Adapters.h +++ b/ace/Timer_Queue_Adapters.h @@ -115,7 +115,7 @@ public: virtual void deactivate (void); // Inform the dispatching thread that it should terminate. - ACE_SYNCH_MUTEX &lock (void); + ACE_SYNCH_MUTEX &mutex (void); // Access the locking mechanism, useful for iteration. TQ &timer_queue (void); diff --git a/ace/Timer_Queue_Adapters.i b/ace/Timer_Queue_Adapters.i index 94de3ad3c8d..e48cec7cd9d 100644 --- a/ace/Timer_Queue_Adapters.i +++ b/ace/Timer_Queue_Adapters.i @@ -12,7 +12,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::ACE_Thread_Timer_Queue_Adapter (void) } template<class TQ> ACE_INLINE ACE_SYNCH_MUTEX & -ACE_Thread_Timer_Queue_Adapter<TQ>::lock (void) +ACE_Thread_Timer_Queue_Adapter<TQ>::mutex (void) { return this->lock_; } diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h index 795a71165b6..ef0d0d0b1ee 100644 --- a/ace/Timer_Queue_T.h +++ b/ace/Timer_Queue_T.h @@ -352,9 +352,9 @@ public: #include "ace/Timer_Queue_T.i" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined (ACE_HPUX_BROKEN_TEMPLATES) #include "ace/Timer_Queue_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HPUX_BROKEN_TEMPLATES */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Timer_Queue_T.cpp") diff --git a/ace/Timer_Wheel.cpp b/ace/Timer_Wheel.cpp index 53f1cd236df..212f1d9ac10 100644 --- a/ace/Timer_Wheel.cpp +++ b/ace/Timer_Wheel.cpp @@ -8,6 +8,10 @@ #include "ace/config.h" #include "ace/Timer_Wheel.h" +#if defined (ACE_HPUX_BROKEN_TEMPLATES) +#include "ace/Timer_Wheel_T.cpp" +#endif /* ACE_HPUX_BROKEN_TEMPLATES */ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Timer_Wheel_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>; template class ACE_Timer_Wheel_Iterator_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>, ACE_SYNCH_RECURSIVE_MUTEX>; diff --git a/ace/Timer_Wheel_T.h b/ace/Timer_Wheel_T.h index ea59262546e..06a769caac5 100644 --- a/ace/Timer_Wheel_T.h +++ b/ace/Timer_Wheel_T.h @@ -199,9 +199,9 @@ private: ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK> &)) }; -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) && !defined (ACE_HPUX_BROKEN_TEMPLATES) #include "ace/Timer_Wheel_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE && !ACE_HPUX_BROKEN_TEMPLATES */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #pragma implementation ("Timer_Wheel_T.cpp") |