ChangeLogTag:Sat

8 files changed, 25 insertions, 23 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 7fe2bf73090..6c8c04ffc16 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct 20 14:13:07 UTC 2012  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Timer_Hash_T.h: Added a forward declaration of
+          ACE_Event_Handler to ensure ACE compiles properly on certain
+          platforms.  Thanks to Peng Xu <pengxu7 at gmail dot com> for
+          reporting this.
+
 Tue Nov  6 18:59:48 UTC 2012  Martin Corino  <mcorino@remedy.nl>
 
         * ace/ace_for_tao.mpc:
diff --git a/ACE/THANKS b/ACE/THANKS
index a420f5a9cbe..5f9edcc8689 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2370,6 +2370,7 @@ Mohsin Zaidi <mohsinrzaidi at gmail dot com>
 Milind Pangarkar <Milind dot Pangarkar at amdocs dot com>
 Ali Akbar Zarezadeh <akzare at cs dot uni-potsdam dot de>
 Andrés Senac González <andres at senac dot es>
+Peng Xu <pengxu7 at gmail dot 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/ACE/ace/Obchunk.h b/ACE/ace/Obchunk.h
index 9690c39f9d1..cd1abb4369d 100644
--- a/ACE/ace/Obchunk.h
+++ b/ACE/ace/Obchunk.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef ACE_OBCHUNK_H
 #define ACE_OBCHUNK_H
 #include /**/ "ace/pre.h"
diff --git a/ACE/ace/Obstack_T.cpp b/ACE/ace/Obstack_T.cpp
index dc1d0acfc6c..961f065213a 100644
--- a/ACE/ace/Obstack_T.cpp
+++ b/ACE/ace/Obstack_T.cpp
@@ -54,8 +54,8 @@ ACE_Obstack_T<ACE_CHAR_T>::request (size_t len)
   // chunk or will need a new one.
   if (this->curr_->cur_ + len >= this->curr_->end_)
     {
-      // Need a new chunk. Save the current one so the current string can be
-      // copied to the new chunk.
+      // Need a new chunk. Save the current one so the current string
+      // can be copied to the new chunk.
       ACE_Obchunk *temp = this->curr_;
       if (this->curr_->next_ == 0)
         {
@@ -122,7 +122,7 @@ ACE_Obstack_T<ACE_CHAR_T>::new_chunk (void)
 
 template <class ACE_CHAR_T>
 ACE_Obstack_T<ACE_CHAR_T>::ACE_Obstack_T (size_t size,
-                                    ACE_Allocator *allocator_strategy)
+                                          ACE_Allocator *allocator_strategy)
   : allocator_strategy_ (allocator_strategy),
     size_ (size),
     head_ (0),
@@ -156,7 +156,7 @@ ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T (void)
 
 template <class ACE_CHAR_T> ACE_CHAR_T *
 ACE_Obstack_T<ACE_CHAR_T>::copy (const ACE_CHAR_T *s,
-                           size_t len)
+                                 size_t len)
 {
   ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::copy");
 
diff --git a/ACE/ace/Obstack_T.h b/ACE/ace/Obstack_T.h
index bba7595771c..b0ed606734b 100644
--- a/ACE/ace/Obstack_T.h
+++ b/ACE/ace/Obstack_T.h
@@ -47,11 +47,11 @@ public:
   /// a new string.  Return -1 if fail, 0 if success.
   int request (size_t len);
 
-  /// Inserting a new ACE_CHAR_T \a c into the current building
-  /// block without freezing (null terminating) the block.
-  /// This function will create new chunk by checking the
-  /// boundary of current Obchunk.  Return
-  /// the location \a c gets inserted to, or 0 if error.
+  /// Inserting a new ACE_CHAR_T \a c into the current building block
+  /// without freezing (null terminating) the block.  This function
+  /// will create new chunk by checking the boundary of current
+  /// Obchunk.  Return the location \a c gets inserted to, or 0 if
+  /// error.
   ACE_CHAR_T *grow (ACE_CHAR_T c);
 
   /// Inserting a new ACE_CHAR_T \a c into the current building
@@ -78,7 +78,7 @@ public:
   /// in the stack is released. Otherwise, @a obj must be an address of an
   /// object allocated in the stack. In this case, @a obj is released along
   /// with everthing allocated in the Obstack since @a obj.
-  void unwind (void* obj);
+  void unwind (void *obj);
 
   /// "Release" the entire stack of Obchunks, putting it back on the free
   /// list.
@@ -95,7 +95,7 @@ protected:
 
   /// Search through the list of Obchunks and release them. Helper funtion
   /// used by unwind.
-  void unwind_i (void* obj);
+  void unwind_i (void *obj);
 
   /// Pointer to the allocator used by this Obstack.
   ACE_Allocator *allocator_strategy_;
diff --git a/ACE/ace/Test_and_Set.h b/ACE/ace/Test_and_Set.h
index d72c3d474b0..c26836d139c 100644
--- a/ACE/ace/Test_and_Set.h
+++ b/ACE/ace/Test_and_Set.h
@@ -26,13 +26,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * @brief Implements the classic ``test and set'' operation.
  *
- *
- *     This class keeps track of the status of <is_set_>, which can
- *     be set based on various events (such as receipt of a
- *     signal).  This class is derived from ACE_Event_Handler so
- *     that it can be "signaled" by a Reactor when a signal occurs.
- *     We assume that <TYPE> is a data type that can be assigned the
- *     value 0 or 1.
+ *     This class keeps track of the status of <is_set_>, which can be
+ *     set based on various events (such as receipt of a signal).
+ *     This class is derived from ACE_Event_Handler so that it can be
+ *     "signaled" by a Reactor when a signal occurs.  We assume that
+ *     <TYPE> is a data type that can be assigned the value 0 or 1.
  */
 template <class ACE_LOCK, class TYPE>
 class ACE_Test_and_Set : public ACE_Event_Handler
diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h
index 77200c943bc..75b0d1ee8fc 100644
--- a/ACE/ace/Timer_Hash_T.h
+++ b/ACE/ace/Timer_Hash_T.h
@@ -29,6 +29,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET, typename TIME
 class ACE_Timer_Hash_T;
 template <typename TYPE>
 class Hash_Token;
+class ACE_Event_Handler;
 
 /**
  * @class ACE_Timer_Hash_Upcall
diff --git a/ACE/tests/Obstack_Test.cpp b/ACE/tests/Obstack_Test.cpp
index ee10ff8e86a..673021a5c43 100644
--- a/ACE/tests/Obstack_Test.cpp
+++ b/ACE/tests/Obstack_Test.cpp
@@ -11,15 +11,11 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Obstack.h"
 #include "ace/Log_Msg.h"
 
-
-
-
 int run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Obstack_Test"));