Core/external : Reinstate ACE 5.8.1 (tested and building)

--HG--
branch : trunk

1 files changed, 24 insertions, 1 deletions

diff --git a/externals/ace/Time_Value.h b/externals/ace/Time_Value.h
index 384ff7d8569..f92c8c7f7f5 100644
--- a/externals/ace/Time_Value.h
+++ b/externals/ace/Time_Value.h
@@ -4,7 +4,7 @@
 /**
  *  @file    Time_Value.h
  *
- *  $Id: Time_Value.h 89121 2010-02-22 14:48:31Z schmidt $
+ *  $Id: Time_Value.h 90683 2010-06-17 22:07:42Z shuston $
  *
  *  @author Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
@@ -129,11 +129,24 @@ public:
   /// Converts from ACE_Time_Value format into milliseconds format.
   /**
    * @return Sum of second field (in milliseconds) and microsecond field
+   *         (in milliseconds).
+   *
+   * @note The semantics of this method differs from the sec() and
+   *       usec() methods.  There is no analogous "millisecond"
+   *       component in an ACE_Time_Value.
+   */
+  ACE_UINT64 get_msec () const;
+
+  /// Converts from ACE_Time_Value format into milliseconds format.
+  /**
+   * @return Sum of second field (in milliseconds) and microsecond field
    *         (in milliseconds) and return them via the @param ms parameter.
    *
    * @note The semantics of this method differs from the sec() and
    *       usec() methods.  There is no analogous "millisecond"
    *       component in an ACE_Time_Value.
+   *
+   * @deprecated Use get_msec() instead.
    */
   void msec (ACE_UINT64 &ms) const;
 
@@ -145,6 +158,8 @@ public:
    * @note The semantics of this method differs from the sec() and
    *       usec() methods.  There is no analogous "millisecond"
    *       component in an ACE_Time_Value.
+   *
+   * @deprecated Use get_msec() instead.
    */
   void msec (ACE_UINT64 &ms) /* const */;
 
@@ -154,6 +169,14 @@ public:
    *       usec() methods.  There is no analogous "millisecond"
    *       component in an ACE_Time_Value.
    */
+  void set_msec (const ACE_UINT64 &ms);
+
+  /// Converts from milli-seconds format into ACE_Time_Value format.
+  /**
+   * @note The semantics of this method differs from the sec() and
+   *       usec() methods.  There is no analogous "millisecond"
+   *       component in an ACE_Time_Value.
+   */
   void msec (long);
 
   /// Converts from milli-seconds format into ACE_Time_Value format.