Mon Sep 28 17:45:44 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Message_Block.h:
          Doxygen change

        * ace/CDR_Base.{h,cpp}:
          Changed consolidate to have a return value because setting the
          new size can fail. Return 0 on ok, -1 on failure. Thanks to
          Annette Wilson <awilson at raytheonvtc dot com>

1 files changed, 9 insertions, 5 deletions

diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h
index 94d28a4dd86..2cddbc0c12b 100644
--- a/ACE/ace/CDR_Base.h
+++ b/ACE/ace/CDR_Base.h
@@ -124,7 +124,7 @@ public:
     /// Use whichever byte order is native to this machine.
     BYTE_ORDER_NATIVE = ACE_CDR_BYTE_ORDER
   };
-    
+
   /**
    * Do byte swapping for each basic IDL type size.  There exist only
    * routines to put byte, halfword (2 bytes), word (4 bytes),
@@ -177,10 +177,14 @@ public:
    */
   static int grow (ACE_Message_Block *mb, size_t minsize);
 
-  /// Copy a message block chain into a single message block,
-  /// preserving the alignment of the first message block of the
-  /// original stream, not the following message blocks.
-  static void consolidate (ACE_Message_Block *dst,
+  /**
+   * Copy a message block chain into a single message block,
+   * preserving the alignment of the first message block of the
+   * original stream, not the following message blocks.
+   * @retval -1 Failure
+   * @retval 0 Success.
+   */
+  static int consolidate (ACE_Message_Block *dst,
                           const ACE_Message_Block *src);
 
   static size_t total_length (const ACE_Message_Block *begin,