Wed Apr 23 14:01:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

20 files changed, 125 insertions, 109 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e8c813e523f..c358e67fbc1 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,44 @@
+Wed Apr 23 14:01:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_rel_manpages:
+          Corrected doxygen path
+
+        * bin/group_test_stats.sh:
+          Helper script to analyze test stat diffs
+
+        * ace/Sig_Handler.{h,cpp}:
+          Doxygen changes and changed third_party_sig_handler flag to a
+          bool
+
+        * ace/Service_Repository.{h,cpp}:
+          Changed ignore_suspended to a bool
+
+        * ace/Intrusive_Auto_Ptr.h:
+          Fixed typo in comment
+
+        * ace/config-vxworks6.2.h:
+        * ace/config-vxworks6.3.h:
+        * ace/config-vxworks6.4.h:
+          Removed workaround that is only needed with VxWorks 5.5.1
+
+        * ace/Codeset_Registry_db.cpp:
+          Added UCS2 and correct short names. This fixes bugzilla 3295
+
+        * ace/Codeset_IBM1047.h:
+          Doxygen changes
+
+        * ace/Cleanup_Strategies_T.h:
+          Layout changes
+
+        * ace/Service_Gestalt.{h,inl}:
+          No need for virtual methods, use bool and doxygen changes
+
+        * ace/Service_Manager.h:
+          Explicitly mark destructor as virtual
+
+        * ace/Service_Object.{h,cpp,inl}:
+          Use bool
+
 Wed Apr 23 01:53:32 CDT 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 	* ACE version 5.6.4 released.
diff --git a/ACE/ace/Cleanup_Strategies_T.h b/ACE/ace/Cleanup_Strategies_T.h
index 9a574ed2bcd..956d8475f17 100644
--- a/ACE/ace/Cleanup_Strategies_T.h
+++ b/ACE/ace/Cleanup_Strategies_T.h
@@ -89,9 +89,7 @@ public:
 template <class KEY, class VALUE, class CONTAINER>
 class ACE_Refcounted_Recyclable_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
-
 public:
-
   /// The method which will do the cleanup of the entry in the container.
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
 };
@@ -113,9 +111,7 @@ public:
 template <class KEY, class VALUE, class CONTAINER>
 class ACE_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
-
 public:
-
   /// The method which will do the cleanup of the entry in the container.
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
 };
@@ -134,9 +130,7 @@ public:
 template <class KEY, class VALUE, class CONTAINER>
 class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
 {
-
 public:
-
   /// The dummy cleanup method.
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
 };
diff --git a/ACE/ace/Codeset_IBM1047.h b/ACE/ace/Codeset_IBM1047.h
index c5bfdafcd49..3bbc7ba0c44 100644
--- a/ACE/ace/Codeset_IBM1047.h
+++ b/ACE/ace/Codeset_IBM1047.h
@@ -9,7 +9,6 @@
  *  Declares the arrays required to convert between ISO8859 (aka
  *  Latin/1) and IBM1047 (aka EBCDIC).
  *
- *
  *  @author Jim Rogers (jrogers@viasoft.com)
  */
 //=============================================================================
@@ -68,10 +67,10 @@ public:
                                              const ACE_CDR::Char *,
                                              ACE_CDR::ULong);
 
-  /// return the native codeset ID as defined in the OSF code and character
+  /// Return the native codeset ID as defined in the OSF code and character
   /// set registry, 0x10020417
   virtual ACE_CDR::ULong ncs ();
-  /// return the translated codeset ID as defined in the OSF code and character
+  /// Return the translated codeset ID as defined in the OSF code and character
   /// set registry, 0x00010001
   virtual ACE_CDR::ULong tcs ();
 };
@@ -111,10 +110,10 @@ public:
                                              const ACE_CDR::Char *,
                                              ACE_CDR::ULong);
 
-  /// return the native codeset ID as defined in the OSF code and character
+  /// Return the native codeset ID as defined in the OSF code and character
   /// set registry, 0x00010001
   virtual ACE_CDR::ULong ncs ();
-  /// return the translated codeset ID as defined in the OSF code and character
+  /// Return the translated codeset ID as defined in the OSF code and character
   /// set registry, 0x10020417
   virtual ACE_CDR::ULong tcs ();
 };
diff --git a/ACE/ace/Codeset_Registry_db.cpp b/ACE/ace/Codeset_Registry_db.cpp
index 8b1ef176576..b7c3f6d31fc 100644
--- a/ACE/ace/Codeset_Registry_db.cpp
+++ b/ACE/ace/Codeset_Registry_db.cpp
@@ -17,13 +17,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_Codeset_Registry::registry_entry const
 ACE_Codeset_Registry::registry_db_[] =
 {
-  {"ISO 8859-1:1987; Latin Alphabet No. 1","ASCII",0x00010001,1,{0x0011},1},
+  {"ISO/IEC 10646-1:1993; UCS-2, Level 1","UCS-2",0x00010100,1,{0x1000},2},
+  {"ISO 8859-1:1987; Latin Alphabet No. 1","ISO8859_1",0x00010001,1,{0x0011},1},
   {"IBM-1047 (CCSID 01047); Latin-1 Open System","EBCDIC",0x10020417,1,{0x0011},1},
   {"ISO/IEC 10646-1:1993; UCS-4, Level 1","UCS-4",0x00010104,1,{0x1000},4},
-  {"ISO/IEC 10646-1:1993; UTF-16, UCS Transformation Format 16-bit form","Unicode",0x00010109,1,{0x1000},2},
+  {"ISO/IEC 10646-1:1993; UTF-16, UCS Transformation Format 16-bit form","UTF-16",0x00010109,1,{0x1000},2},
   {"X/Open UTF-8; UCS Transformation Format 8 (UTF-8)","UTF-8",0x05010001,1,{0x1000},6}
 };
 
-size_t const ACE_Codeset_Registry::num_registry_entries_ = 5;
+size_t const ACE_Codeset_Registry::num_registry_entries_ = 6;
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h
index 1097fcc9a67..215553524c5 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.h
+++ b/ACE/ace/Intrusive_Auto_Ptr.h
@@ -33,7 +33,7 @@ template <class X> class ACE_Intrusive_Auto_Ptr;
  * @class ACE_Intrusive_Auto_Ptr
  *
  * @brief This class implements support for a reference counted
- * auto_ptr. It assumes refernce counting abilities of the
+ * auto_ptr. It assumes reference counting abilities of the
  * parameterizing class.
  *
  * Assigning or copying instances of an ACE_Intrusive_Auto_Ptr will
diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h
index 0ec6ac0965d..ae76eb3dfbf 100644
--- a/ACE/ace/Service_Gestalt.h
+++ b/ACE/ace/Service_Gestalt.h
@@ -90,7 +90,7 @@ public:
 
   /// Perform user-specified close activities and remove dynamic
   /// memory.
-  virtual ~ACE_Service_Gestalt (void);
+  ~ACE_Service_Gestalt (void);
 
   /// Dump the state of an object.
   void dump (void) const;
@@ -203,20 +203,20 @@ public:
   int process_file (const ACE_TCHAR file[]);
 
   /**
-   * Locate an entry with @a name in the table.  If <ignore_suspended>
+   * Locate an entry with @a name in the table.  If @a ignore_suspended
    * is set then only consider services marked as resumed.  If the
    * caller wants the located entry, pass back a pointer to the
-   * located entry via <srp>.  If @a name is not found, -1 is returned.
+   * located entry via @a srp.  If @a name is not found, -1 is returned.
    * If @a name is found, but it is suspended and the caller wants to
    * ignore suspended services a -2 is returned.
    */
   int find (const ACE_TCHAR name[],
             const ACE_Service_Type **srp = 0,
-            int ignore_suspended = 1) const;
+            bool ignore_suspended = true) const;
 
   /**
    * Handle the command-line options intended for the
-   * <ACE_Service_Gestalt>.  Note that <argv[0]> is assumed to be the
+   * ACE_Service_Gestalt.  Note that <argv[0]> is assumed to be the
    * program name.
    *
    * The arguments that are valid in a call to this method are
@@ -261,18 +261,18 @@ public:
                   const ACE_TCHAR *parameters);
 #endif /* (ACE_USES_CLASSIC_SVC_CONF == 1) */
 
-  // Dynamically link the shared object file and retrieve a pointer to
-  // the designated shared object in this file.
-  // @obsolete
-  // @note This is error-prone in the presense of dynamic services,
-  // which in turn initialize their own static services. This method
-  // will allow those static services to register *before* the dynamic
-  // service that owns them.  Upon finalization of the static services
-  // the process will typically crash, because the dynamic service's
-  // DLL may have been already released, together with the memory in
-  // which the static services reside.  It may not crash, for
-  // instance, when the first static service to register is the same
-  // as the dynamic service being loaded. You should be so lucky!
+  /// Dynamically link the shared object file and retrieve a pointer to
+  /// the designated shared object in this file.
+  /// @deprecated
+  /// @note This is error-prone in the presense of dynamic services,
+  /// which in turn initialize their own static services. This method
+  /// will allow those static services to register *before* the dynamic
+  /// service that owns them.  Upon finalization of the static services
+  /// the process will typically crash, because the dynamic service's
+  /// DLL may have been already released, together with the memory in
+  /// which the static services reside.  It may not crash, for
+  /// instance, when the first static service to register is the same
+  /// as the dynamic service being loaded. You should be so lucky!
   int initialize (const ACE_Service_Type *,
                   const ACE_TCHAR *parameters);
 
@@ -288,7 +288,7 @@ public:
    * Suspend @a svc_name.  Note that this will not unlink the service
    * from the daemon if it was dynamically linked, it will mark it as
    * being suspended in the Service Repository and call the <suspend>
-   * member function on the appropriate <ACE_Service_Object>.  A
+   * member function on the appropriate ACE_Service_Object.  A
    * service can be resumed later on by calling the <RESUME> member
    * function...
    */
@@ -318,11 +318,8 @@ public:
 
 protected:
 
-  /**
-   *
-   */
-  virtual int parse_args_i (int, ACE_TCHAR *argv[],
-                            bool& ignore_default_svc_conf_file);
+  int parse_args_i (int, ACE_TCHAR *argv[],
+                    bool& ignore_default_svc_conf_file);
 
   /**
    * Performs an open without parsing command-line arguments.  The
@@ -334,11 +331,11 @@ protected:
    * @c ACE_Log_Msg::priority_mask() appropriately.  Returns number of
    * errors that occurred on failure and 0 otherwise.
    */
-  virtual int open_i (const ACE_TCHAR program_name[],
-                      const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY,
-                      bool ignore_static_svcs = true,
-                      bool ignore_default_svc_conf_file = false,
-                      bool ignore_debug_flag = false);
+  int open_i (const ACE_TCHAR program_name[],
+              const ACE_TCHAR *logger_key = ACE_DEFAULT_LOGGER_KEY,
+              bool ignore_static_svcs = true,
+              bool ignore_default_svc_conf_file = false,
+              bool ignore_debug_flag = false);
 
   /// Initialize the <svc_conf_file_queue_> if necessary.
   int init_svc_conf_file_queue (void);
@@ -368,8 +365,8 @@ protected:
   ACE_XML_Svc_Conf* get_xml_svc_conf (ACE_DLL &d);
 #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */
 
-  // Dynamically link the shared object file and retrieve a pointer to
-  // the designated shared object in this file.
+  /// Dynamically link the shared object file and retrieve a pointer to
+  /// the designated shared object in this file.
   int initialize_i (const ACE_Service_Type *sr, const ACE_TCHAR *parameters);
 
   const ACE_Static_Svc_Descriptor* find_processed_static_svc (const ACE_TCHAR*);
@@ -380,7 +377,6 @@ protected:
   /// constructor.
   int init_i (void);
 
-
 protected:
 
   // Maintain a queue of services to be configured from the
diff --git a/ACE/ace/Service_Gestalt.inl b/ACE/ace/Service_Gestalt.inl
index dd8d18dd4bf..6b93f5e8bd1 100644
--- a/ACE/ace/Service_Gestalt.inl
+++ b/ACE/ace/Service_Gestalt.inl
@@ -55,7 +55,7 @@ ACE_Service_Gestalt::open (int argc,
 ACE_INLINE int
 ACE_Service_Gestalt::find (const ACE_TCHAR name[],
                            const ACE_Service_Type **srp,
-                           int ignore_suspended) const
+                           bool ignore_suspended) const
 {
   // Closing the gestalt will have disassociated it from the
   // repository. If the repository used to be owned by the gestalt, it
diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h
index c0d0c7e0fa7..38cf0dafb59 100644
--- a/ACE/ace/Service_Manager.h
+++ b/ACE/ace/Service_Manager.h
@@ -57,7 +57,7 @@ public:
   ACE_Service_Manager (void);
 
   /// Destructor.
-  ~ACE_Service_Manager (void);
+  virtual ~ACE_Service_Manager (void);
 
 protected:
   // = Perform the various meta-services.
diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp
index cdc3672c774..11674885270 100644
--- a/ACE/ace/Service_Object.cpp
+++ b/ACE/ace/Service_Object.cpp
@@ -51,12 +51,12 @@ ACE_Service_Type::dump (void) const
 ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
                                     ACE_Service_Type_Impl *t,
                                     const ACE_DLL &dll,
-                                    int active)
+                                    bool active)
   : name_ (0),
     type_ (t),
     dll_ (dll),
     active_ (active),
-    fini_already_called_ (0)
+    fini_already_called_ (false)
 {
   ACE_TRACE ("ACE_Service_Type::ACE_Service_Type");
   this->name (n);
@@ -65,11 +65,11 @@ ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
 ACE_Service_Type::ACE_Service_Type (const ACE_TCHAR *n,
                                     ACE_Service_Type_Impl *t,
                                     ACE_SHLIB_HANDLE handle,
-                                    int active)
+                                    bool active)
   : name_ (0),
     type_ (t),
     active_ (active),
-    fini_already_called_ (0)
+    fini_already_called_ (false)
 {
   ACE_TRACE ("ACE_Service_Type::ACE_Service_Type");
   this->dll_.set_handle (handle);
@@ -93,10 +93,10 @@ ACE_Service_Type::fini (void)
                 this->name_,
                 this->dll_.dll_name_));
 
-  if (this->fini_already_called_)
+  if (!this->fini_already_called_)
     return 0;
 
-  this->fini_already_called_ = 1;
+  this->fini_already_called_ = true;
 
   if (this->type_ == 0)
     {
@@ -122,7 +122,7 @@ int
 ACE_Service_Type::suspend (void) const
 {
   ACE_TRACE ("ACE_Service_Type::suspend");
-  (const_cast<ACE_Service_Type *> (this))->active_ = 0;
+  (const_cast<ACE_Service_Type *> (this))->active_ = false;
   return this->type_->suspend ();
 }
 
@@ -130,7 +130,7 @@ int
 ACE_Service_Type::resume (void) const
 {
   ACE_TRACE ("ACE_Service_Type::resume");
-  (const_cast<ACE_Service_Type *> (this))->active_ = 1;
+  (const_cast<ACE_Service_Type *> (this))->active_ = true;
   return this->type_->resume ();
 }
 
diff --git a/ACE/ace/Service_Object.h b/ACE/ace/Service_Object.h
index abc4781d9c8..1109bc19f32 100644
--- a/ACE/ace/Service_Object.h
+++ b/ACE/ace/Service_Object.h
@@ -36,10 +36,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * @brief Provide the abstract base class common to all service
  * implementations.
  *
- * Classes that inherit from <ACE_Service_Objects> are capable
+ * Classes that inherit from ACE_Service_Objects are capable
  * of being registered with the ACE_Reactor (due to the
  * ACE_Event_Handler, as well as being dynamically linked by
- * the ACE_Service_Config (due to the <ACE_Shared_Object>).
+ * the ACE_Service_Config (due to the ACE_Shared_Object).
  */
 class ACE_Export ACE_Service_Object
   : public ACE_Event_Handler,
@@ -95,32 +95,32 @@ public:
   ACE_Service_Type (const ACE_TCHAR *n,
                     ACE_Service_Type_Impl *o,
                     const ACE_DLL &dll,
-                    int active);
+                    bool active);
   ACE_Service_Type (const ACE_TCHAR *n,
                     ACE_Service_Type_Impl *o,
                     ACE_SHLIB_HANDLE handle,
-                    int active);
+                    bool active);
   ~ACE_Service_Type (void);
 
   const ACE_TCHAR *name (void) const;
   void name (const ACE_TCHAR *);
 
   const ACE_Service_Type_Impl *type (void) const;
-  void type (const ACE_Service_Type_Impl *, int active = 1);
+  void type (const ACE_Service_Type_Impl *, bool active = true);
 
-  // Is this just a stub for the real thing?
+  /// Is this just a stub for the real thing?
   bool is_forward_declaration (void) const;
 
   int suspend (void) const;
   int resume (void) const;
-  int  active (void) const;
-  void active (int);
+  bool active (void) const;
+  void active (bool turnon);
 
   /// Calls <fini> on <type_>
   int fini (void);
 
   /// Check if the service has been fini'ed.
-  int fini_called (void) const;
+  bool fini_called (void) const;
 
   /// Dump the state of an object.
   void dump (void) const;
@@ -145,11 +145,11 @@ private:
   /// dynamically linked).
   mutable ACE_DLL dll_;
 
-  /// 1 if svc is currently active, otherwise 0.
-  int active_;
+  /// true if svc is currently active, otherwise false.
+  bool active_;
 
-  /// 1 if <fini> on <type_> has already been called, otherwise 0.
-  int fini_already_called_;
+  /// true if <fini> on <type_> has already been called, otherwise false.
+  bool fini_already_called_;
 };
 
 /**
diff --git a/ACE/ace/Service_Object.inl b/ACE/ace/Service_Object.inl
index 5e58bc57588..2497eef4490 100644
--- a/ACE/ace/Service_Object.inl
+++ b/ACE/ace/Service_Object.inl
@@ -35,28 +35,28 @@ ACE_Service_Type::type (void) const
 }
 
 ACE_INLINE void
-ACE_Service_Type::type (const ACE_Service_Type_Impl *o, int enabled)
+ACE_Service_Type::type (const ACE_Service_Type_Impl *o, bool enabled)
 {
   ACE_TRACE ("ACE_Service_Type::type");
   this->type_ = o;
   ((ACE_Service_Type *) this)->active_ = enabled;
 }
 
-ACE_INLINE int
+ACE_INLINE bool
 ACE_Service_Type::active (void) const
 {
   ACE_TRACE ("ACE_Service_Type::active");
-  return this->active_ != 0;
+  return this->active_;
 }
 
 ACE_INLINE void
-ACE_Service_Type::active (int turnon)
+ACE_Service_Type::active (bool turnon)
 {
   ACE_TRACE ("ACE_Service_Type::active");
   this->active_ = turnon;
 }
 
-ACE_INLINE int
+ACE_INLINE bool
 ACE_Service_Type::fini_called (void) const
 {
   ACE_TRACE ("ACE_Service_Type::fini_called");
diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp
index 1d2ec015076..e8aae6dd649 100644
--- a/ACE/ace/Service_Repository.cpp
+++ b/ACE/ace/Service_Repository.cpp
@@ -627,7 +627,7 @@ bool
 ACE_Service_Repository_Iterator::valid (void) const
 {
   ACE_TRACE ("ACE_Service_Repository_Iterator::valid");
-  if (this->ignore_suspended_ == 0)
+  if (!this->ignore_suspended_)
     return (this->svc_rep_.service_vector_[this->next_] != 0); // skip over gaps
 
   return (this->svc_rep_.service_vector_[this->next_] != 0
diff --git a/ACE/ace/Service_Repository.h b/ACE/ace/Service_Repository.h
index 449d7a88baf..9026856fb55 100644
--- a/ACE/ace/Service_Repository.h
+++ b/ACE/ace/Service_Repository.h
@@ -266,7 +266,7 @@ private:
   size_t next_;
 
   /// Are we ignoring suspended services?
-  int ignore_suspended_;
+  bool ignore_suspended_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp
index 37d8de90bc6..df340ba1b1d 100644
--- a/ACE/ace/Sig_Handler.cpp
+++ b/ACE/ace/Sig_Handler.cpp
@@ -289,9 +289,9 @@ ACE_Sig_Handler::dispatch (int signum,
 // <remove_handler> method.
 int ACE_Sig_Handlers::sigkey_ = 0;
 
-// If this is > 0 then a 3rd party library has registered a
+// If this is true then a 3rd party library has registered a
 // handler...
-int ACE_Sig_Handlers::third_party_sig_handler_ = 0;
+bool ACE_Sig_Handlers::third_party_sig_handler_ = false;
 
 // Make life easier by defining typedefs...
 typedef ACE_Fixed_Set <ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS> ACE_SIG_HANDLERS_SET;
@@ -376,7 +376,7 @@ ACE_Sig_Handlers::register_handler (int signum,
             return -1;
 
           // Note that we've seen a 3rd party handler...
-          ACE_Sig_Handlers::third_party_sig_handler_ = 1;
+          ACE_Sig_Handlers::third_party_sig_handler_ = true;
 
           // Create a new 3rd party disposition, remembering its
           // preferred signal blocking etc...;
diff --git a/ACE/ace/Sig_Handler.h b/ACE/ace/Sig_Handler.h
index 0d99bf81341..4b1e813e2c5 100644
--- a/ACE/ace/Sig_Handler.h
+++ b/ACE/ace/Sig_Handler.h
@@ -43,8 +43,10 @@ class ACE_Sig_Action;
 class ACE_Export ACE_Sig_Handler
 {
 public:
-  /// Default ctor/dtor.
+  /// Default constructor.
   ACE_Sig_Handler (void);
+
+  /// Destructor
   virtual ~ACE_Sig_Handler (void);
 
   // = Registration and removal methods.
@@ -87,8 +89,7 @@ public:
 
   /// Set a new ACE_Event_Handler that is associated with @a signum.
   /// Return the existing handler.
-  virtual ACE_Event_Handler *handler (int signum,
-                                      ACE_Event_Handler *);
+  virtual ACE_Event_Handler *handler (int signum, ACE_Event_Handler *);
 
   /**
    * Callback routine registered with sigaction(2) that dispatches the
@@ -221,9 +222,9 @@ private:
    */
   static int sigkey_;
 
-  /// If this is > 0 then a 3rd party library has registered a
+  /// If this is true then a 3rd party library has registered a
   /// handler...
-  static int third_party_sig_handler_;
+  static bool third_party_sig_handler_;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h
index ff78628b15b..f2897f81e3f 100644
--- a/ACE/ace/config-vxworks6.2.h
+++ b/ACE/ace/config-vxworks6.2.h
@@ -38,14 +38,6 @@
 # define ACE_LACKS_IOSTREAM_FX
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
-# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
-  // GNU 3.3+ toolchain supports long long types but fails to define this so STL
-  // skips some definitions
-#   if !defined (_GLIBCPP_USE_LONG_LONG)
-#     define _GLIBCPP_USE_LONG_LONG
-#   endif
-# endif /* (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) */
-
 # if defined (__RTP__) && !defined (_HAS_C9X)
 // Workaround for the fact that under RTP the log2 method can't be used
 // without this define set, see TSR560446
diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h
index b855b301793..3d4bb12a01f 100644
--- a/ACE/ace/config-vxworks6.3.h
+++ b/ACE/ace/config-vxworks6.3.h
@@ -28,14 +28,6 @@
 # define ACE_LACKS_IOSTREAM_FX
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
-# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
-  // GNU 3.3+ toolchain supports long long types but fails to define this so STL
-  // skips some definitions
-#   if !defined (_GLIBCPP_USE_LONG_LONG)
-#     define _GLIBCPP_USE_LONG_LONG
-#   endif
-# endif /* (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) */
-
 # if defined (__RTP__) && !defined (_HAS_C9X)
 // Workaround for the fact that under RTP the log2 method can't be used
 // without this define set, see TSR560446
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index 37b13ef7dd1..8b28f040d65 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -37,14 +37,6 @@
 # define ACE_LACKS_IOSTREAM_FX
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
-# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
-  // GNU 3.3+ toolchain supports long long types but fails to define this so STL
-  // skips some definitions
-#   if !defined (_GLIBCPP_USE_LONG_LONG)
-#     define _GLIBCPP_USE_LONG_LONG
-#   endif
-# endif /* (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) */
-
 # if defined (__RTP__) && !defined (_HAS_C9X)
 // Workaround for the fact that under RTP the log2 method can't be used
 // without this define set, see TSR560446
diff --git a/ACE/bin/generate_rel_manpages b/ACE/bin/generate_rel_manpages
index bbbda69b090..4d3f9f6bb6b 100755
--- a/ACE/bin/generate_rel_manpages
+++ b/ACE/bin/generate_rel_manpages
@@ -24,7 +24,7 @@ my $status= 0;
 &can_run($perl_path.' -V') ||
   die "$0: perl path is incorrect, please fix the script\n";
 
-my  $doxy_path = '/usr/bin';
+my  $doxy_path = '/usr/local/bin';
 
 my $doxy_version = '1.5.5';
 
diff --git a/ACE/bin/group_test_stats.sh b/ACE/bin/group_test_stats.sh
new file mode 100755
index 00000000000..59882fb6d3d
--- /dev/null
+++ b/ACE/bin/group_test_stats.sh
@@ -0,0 +1,8 @@
+unlink tmp
+unlink tmp2
+cat t.txt | grep '+[a-z|A-Z]' > tmp
+sort tmp | uniq -c > tmp2
+sort tmp2 > uniq.txt
+unlink tmp
+unlink tmp2
+cat uniq.txt