ChangeLogTag:Fri

1 files changed, 44 insertions, 40 deletions

diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h
index f94ffeafc71..5be6a4c065a 100644
--- a/ACE/ace/UUID.h
+++ b/ACE/ace/UUID.h
@@ -30,32 +30,30 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE_Utils
 {
   /// Class to hold a MAC address
-  class ACE_Export UUID_node
+  class ACE_Export UUID_Node
   {
   public:
 
     /// Constructor
-    UUID_node (void);
+    UUID_Node (void);
 
     enum {NODE_ID_SIZE = 6};
-    typedef u_char NodeID[NODE_ID_SIZE];
+    typedef u_char Node_ID[NODE_ID_SIZE];
 
-    NodeID& nodeID (void);
-    void nodeID (NodeID&);
+    Node_ID &node_ID (void);
+    void node_ID (Node_ID&);
 
     ///// Equality Operations
-    bool operator == (const UUID_node& right) const;
-    bool operator != (const UUID_node& right) const;
+    bool operator == (const UUID_Node& right) const;
+    bool operator != (const UUID_Node& right) const;
 
     ///// Relational Operations
-    //bool operator <  (const UUID_node& right) const;
+    //bool operator <  (const UUID_Node& right) const;
 
   private:
-    NodeID nodeID_;
+    Node_ID node_ID_;
   };
 
-
-
   /**
    *  @class ACE_UUID
    *
@@ -89,23 +87,23 @@ namespace ACE_Utils
     // Destructor
     ~UUID (void);
 
-    ACE_UINT32 timeLow (void) const;
-    void timeLow (ACE_UINT32);
+    ACE_UINT32 time_low (void) const;
+    void time_low (ACE_UINT32);
 
-    ACE_UINT16 timeMid (void) const;
-    void timeMid (ACE_UINT16);
+    ACE_UINT16 time_mid (void) const;
+    void time_mid (ACE_UINT16);
 
-    ACE_UINT16 timeHiAndVersion (void) const;
-    void timeHiAndVersion (ACE_UINT16);
+    ACE_UINT16 time_hi_and_version (void) const;
+    void time_hi_and_version (ACE_UINT16);
 
-    u_char clockSeqHiAndReserved (void) const;
-    void clockSeqHiAndReserved (u_char);
+    u_char clock_seq_hi_and_reserved (void) const;
+    void clock_seq_hi_and_reserved (u_char);
 
-    u_char clockSeqLow (void) const;
-    void clockSeqLow (u_char);
+    u_char clock_seq_low (void) const;
+    void clock_seq_low (u_char);
 
-    UUID_node* node (void) const;
-    void node (UUID_node*);
+    UUID_Node* node (void) const;
+    void node (UUID_Node*);
 
     ACE_CString* thr_id (void);
     void thr_id (char*);
@@ -132,17 +130,17 @@ namespace ACE_Utils
     //bool operator>= (const UUID &right) const;
 
   private:
-    void from_string_i (const ACE_CString& uuidString);
+    void from_string_i (const ACE_CString& uuid_string);
 
     UUID& operator= (const UUID&);
 
     /// Data Members for Class Attributes
-    ACE_UINT32 timeLow_;
-    ACE_UINT16 timeMid_;
-    ACE_UINT16 timeHiAndVersion_;
-    u_char clockSeqHiAndReserved_;
-    u_char clockSeqLow_;
-    UUID_node* node_;
+    ACE_UINT32 time_low_;
+    ACE_UINT16 time_mid_;
+    ACE_UINT16 time_hi_and_version_;
+    u_char clock_seq_hi_and_reserved_;
+    u_char clock_seq_low_;
+    UUID_Node* node_;
     bool node_release_;
     ACE_CString thr_id_;
     ACE_CString pid_;
@@ -152,7 +150,6 @@ namespace ACE_Utils
     ACE_CString *as_string_;
   };
 
-
   /**
    * @class ACE_UUID_Generator
    *
@@ -173,15 +170,15 @@ namespace ACE_Utils
     /// Format timestamp, clockseq, and nodeID into an UUID of the
     /// specified version and variant. For generating UUID's with
     /// thread and process ids use variant=0xc0
-    void generateUUID (UUID&, ACE_UINT16 version=0x0001, u_char variant=0x80);
+    void generate_UUID (UUID&, ACE_UINT16 version=0x0001, u_char variant=0x80);
 
     /// Format timestamp, clockseq, and nodeID into a VI UUID. For
     /// generating UUID's with thread and process ids use variant=0xc0
-    UUID* generateUUID (ACE_UINT16 version=0x0001, u_char variant=0x80);
+    UUID* generate_UUID (ACE_UINT16 version=0x0001, u_char variant=0x80);
 
     /// Type to represent UTC as a count of 100 nanosecond intervals
     /// since 00:00:00.00, 15 October 1582.
-    typedef ACE_UINT64 UUID_time;
+    typedef ACE_UINT64 UUID_Time;
 
     /// The locking strategy prevents multiple generators from accessing
     /// the UUID_state at the same time. Get the locking strategy.
@@ -194,25 +191,31 @@ namespace ACE_Utils
   private:
 
     /// The system time when that last uuid was generated.
-    UUID_time timeLast_;
+    UUID_Time time_last_;
 
     /// Type to contain the UUID generator persistent state. This will
     /// be kept in memory mapped shared memory
     struct UUID_State
     {
-      UUID_time timestamp;
-      UUID_node node;
-      ACE_UINT16 clockSequence;
+      UUID_Time timestamp;
+      UUID_Node node;
+      ACE_UINT16 clock_sequence;
     };
 
     /// Obtain a UUID timestamp. Compensate for the fact that the time
     /// obtained from getSystem time has a resolution less than 100ns.
-  void get_timestamp (UUID_time& timestamp);
+    void get_timestamp (UUID_Time& timestamp);
+
+    /// Obtain a UUID timestamp and clock sequence. Compensate for the
+    /// fact that the time obtained from getSystem time has a
+    /// resolution less than 100ns.
+    void get_timestamp_and_clocksequence (UUID_Time& timestamp, 
+                                          ACE_UINT16& clockSequence);
 
     /// Obtain the system time in UTC as a count of 100 nanosecond intervals
     /// since 00:00:00.00, 15 October 1582 (the date of Gregorian reform to
   /// the Christian calendar).
-    void get_systemtime( UUID_time& timeNow);
+    void get_systemtime( UUID_Time& timeNow);
 
     /// The UUID generator persistent state.
     UUID_State uuid_state_;
@@ -233,3 +236,4 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif // ACE_UUID_H
+