*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 58 insertions, 0 deletions

diff --git a/dep/ACE_wrappers/ace/UUID.h b/dep/ACE_wrappers/ace/UUID.h
index a29ba320b38..f2dceff3e51 100644
--- a/dep/ACE_wrappers/ace/UUID.h
+++ b/dep/ACE_wrappers/ace/UUID.h
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+
 //=============================================================================
 /**
  *  @file  UUID.h
@@ -9,37 +10,50 @@
  *  @author Yamuna Krishnmaurthy <yamuna@oomworks.com>
  */
 //=============================================================================
+
 #ifndef ACE_UUID_H
 #define ACE_UUID_H
 #include /**/ "ace/pre.h"
+
 #include /**/ "ace/config-all.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "ace/SString.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE_Utils
 {
   /// Class to hold a MAC address
   class ACE_Export UUID_Node
   {
   public:
+
     /// Constructor
     UUID_Node (void);
+
     enum {NODE_ID_SIZE = 6};
     typedef u_char Node_ID[NODE_ID_SIZE];
+
     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;
+
     ///// Relational Operations
     //bool operator <  (const UUID_Node& right) const;
+
   private:
     Node_ID node_ID_;
   };
+
   /**
    *  @class ACE_UUID
    *
@@ -61,45 +75,65 @@ namespace ACE_Utils
   class ACE_Export UUID
   {
   public:
+
     /// Constructor
     UUID (void);
+
     /// Constructs a UUID from a string representation.
     UUID (const ACE_CString& uuidString);
+
     UUID (const UUID &right);
+
     // Destructor
     ~UUID (void);
+
     ACE_UINT32 time_low (void) const;
     void time_low (ACE_UINT32);
+
     ACE_UINT16 time_mid (void) const;
     void time_mid (ACE_UINT16);
+
     ACE_UINT16 time_hi_and_version (void) const;
     void time_hi_and_version (ACE_UINT16);
+
     u_char clock_seq_hi_and_reserved (void) const;
     void clock_seq_hi_and_reserved (u_char);
+
     u_char clock_seq_low (void) const;
     void clock_seq_low (u_char);
+
     UUID_Node* node (void) const;
     void node (UUID_Node*);
+
     ACE_CString* thr_id (void);
     void thr_id (char*);
+
     ACE_CString* pid (void);
     void pid (char*);
+
     /// Returns a string representation of the UUID
     const ACE_CString* to_string (void);
+
     /// Set the value using a string
     void from_string (const ACE_CString& uuid_string);
+
     static UUID NIL_UUID;
+
     /// Equality Operations
     bool operator== (const UUID &right) const;
     bool operator!= (const UUID &right) const;
+
     /// Relational Operations
     //bool operator<  (const UUID &right) const;
     //bool operator>  (const UUID &right) const;
     //bool operator<= (const UUID &right) const;
     //bool operator>= (const UUID &right) const;
+
   private:
     void from_string_i (const ACE_CString& uuid_string);
+
     UUID& operator= (const UUID&);
+
     /// Data Members for Class Attributes
     ACE_UINT32 time_low_;
     ACE_UINT16 time_mid_;
@@ -110,10 +144,12 @@ namespace ACE_Utils
     bool node_release_;
     ACE_CString thr_id_;
     ACE_CString pid_;
+
     /// The string representation of the UUID. This is created and
     /// updated only on demand.
     ACE_CString *as_string_;
   };
+
   /**
    * @class ACE_UUID_Generator
    *
@@ -123,29 +159,40 @@ namespace ACE_Utils
   class ACE_Export UUID_Generator
   {
   public:
+
     enum {ACE_UUID_CLOCK_SEQ_MASK = 0x3FFF};
+
     UUID_Generator();
     ~UUID_Generator();
+
     void init (void);
+
     /// 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 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* 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;
+
     /// The locking strategy prevents multiple generators from accessing
     /// the UUID_state at the same time. Get the locking strategy.
     ACE_SYNCH_MUTEX* lock (void);
+
     /// Set a new locking strategy and return the old one.
     void lock (ACE_SYNCH_MUTEX* lock,
                bool release_lock);
+
   private:
+
     /// The system time when that last uuid was generated.
     UUID_Time time_last_;
+
     /// Type to contain the UUID generator persistent state. This will
     /// be kept in memory mapped shared memory
     struct UUID_State
@@ -154,29 +201,40 @@ namespace ACE_Utils
       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);
+
     /// 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);
+
     /// The UUID generator persistent state.
     UUID_State uuid_state_;
+
     ACE_SYNCH_MUTEX* lock_;
     bool destroy_lock_;
   };
+
   typedef ACE_Singleton<UUID_Generator, ACE_SYNCH_MUTEX> UUID_GENERATOR;
+
 }
+
 ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "ace/UUID.inl"
 #endif /* __ACE_INLINE__ */
+
 #include /**/ "ace/post.h"
 #endif // ACE_UUID_H
 
+