diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-09-28 15:00:16 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-09-28 15:00:16 +0000 |
| commit | 5da58dd511eef8a29cd07673e5dbe00ff33e287d (patch) | |
| tree | 9906ce6727902ddb57c96732b24b948f20fe19ac | |
| parent | 69f5ae747b745360cd0937637d3bebcfe96180ea (diff) | |
| download | ATCD-5da58dd511eef8a29cd07673e5dbe00ff33e287d.tar.gz | |
ChangeLogTag: Wed Sep 28 07:46:57 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ace/Atomic_Op.cpp | 2 | ||||
| -rw-r--r-- | ace/Atomic_Op.h | 2 | ||||
| -rw-r--r-- | ace/Atomic_Op.inl | 2 | ||||
| -rw-r--r-- | ace/Object_Manager.cpp | 2 |
5 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index d9bb38d14f1..31ff7dadcff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Wed Sep 28 07:46:57 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/Atomic_Op.cpp: + * ace/Atomic_Op.h: + * ace/Atomic_Op.inl: + * ace/Object_Manager.cpp: + + Revert change: + Fri Sep 16 19:54:20 2005 J.T. Conklin <jtc@acorntoolworks.com> + + As the new ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> + template specialization was not found responsible for the + TAO performance regressions. + Wed Sep 28 11:54:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * ACE-INSTALL.html: diff --git a/ace/Atomic_Op.cpp b/ace/Atomic_Op.cpp index b65b0141364..eee9f742d2c 100644 --- a/ace/Atomic_Op.cpp +++ b/ace/Atomic_Op.cpp @@ -213,7 +213,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::dump (void) const #endif /* ACE_HAS_DUMP */ } -#if 0 long (*ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::increment_fn_) (volatile long *) = 0; long (*ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::decrement_fn_) (volatile long *) = 0; long (*ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::exchange_fn_) (volatile long *, long) = 0; @@ -246,6 +245,5 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } -#endif #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ diff --git a/ace/Atomic_Op.h b/ace/Atomic_Op.h index 0a181ef548c..968ed3d49b5 100644 --- a/ace/Atomic_Op.h +++ b/ace/Atomic_Op.h @@ -140,7 +140,6 @@ private: static long (*exchange_add_fn_) (volatile long *, long); }; -#if 0 /** * @class ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> * @@ -236,7 +235,6 @@ private: static long (*exchange_fn_) (volatile long *, long); static long (*exchange_add_fn_) (volatile long *, long); }; -#endif #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ diff --git a/ace/Atomic_Op.inl b/ace/Atomic_Op.inl index cfd41f7749f..7c481b206ad 100644 --- a/ace/Atomic_Op.inl +++ b/ace/Atomic_Op.inl @@ -150,7 +150,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::value_i (void) } -#if 0 ACE_INLINE ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op (void) : value_ (0) @@ -294,6 +293,5 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::value_i (void) { return this->value_; } -#endif #endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index 39781fbf5d4..4866b55f02c 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -196,9 +196,7 @@ ACE_Object_Manager::init (void) # if defined (ACE_HAS_BUILTIN_ATOMIC_OP) ACE_Atomic_Op<ACE_Thread_Mutex, long>::init_functions (); -#if 0 ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::init_functions (); -#endif # endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ # if !defined (ACE_LACKS_ACE_SVCCONF) |