diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-08 18:26:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-08 18:26:42 +0100 |
commit | a2239fcbf8a7eabce628ca0841dc1eaa69a68b3d (patch) | |
tree | e31748807be9de0c33abfb59c0b7068f04edf10f | |
parent | aec45120fa3c3d97eff9d465f1d2cbbd32f032e3 (diff) | |
parent | 39b15c5803d499e74f4ae17e6d45fc957e04ffdc (diff) | |
download | ATCD-a2239fcbf8a7eabce628ca0841dc1eaa69a68b3d.tar.gz |
Merge pull request #1445 from jwillemsen/jwi-uuidtypo
Fixed typo in enum
-rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h | 12 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h index 732b4bdcb04..cb548635d88 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h @@ -37,20 +37,20 @@ class TAO_FtRtEvent_Export UUID public: enum { - BINRARY_LENGTH= 16, + BINARY_LENGTH= 16, // the required length for the string representation including the termination '\0' STRING_LENGTH = 37 }; /* Construct an Global Unique Identifier. */ - UUID(void); + UUID(); /* This is used to create an uninitialized UUID. */ UUID(int); /* - * Construct an UUID from the binary represetation. If you want to avoid a memory + * Construct an UUID from the binary representation. If you want to avoid a memory * copy operation for this constructor. You can safely reinterpret_cast the 16 * bytes buffer into the UUID object and use all the member functions provided in * this class except is_valid() which is only useful if a UUID object is @@ -75,7 +75,7 @@ class TAO_FtRtEvent_Export UUID * representation. This is done by testing whether the time_hi and time_mid fields * of the timestamp are 0. By current time, those two field shouldn't be 0 at all. */ - bool is_valid(void) const; + bool is_valid() const; /* * convert to a string representation the buffer size provided must be at least @@ -87,7 +87,7 @@ class TAO_FtRtEvent_Export UUID /* * convert to a string representation the buffer size provided must be at least - * BINRARY_LENGTH + * BINARY_LENGTH */ void to_binary(unsigned char *binary_rep) const; @@ -101,7 +101,7 @@ class TAO_FtRtEvent_Export UUID ACE_UINT32 low; ACE_UINT32 hi; } timestamp; - unsigned char uuid[BINRARY_LENGTH]; + unsigned char uuid[BINARY_LENGTH]; } rep_; }; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl index 131e87c866c..b6890c2d973 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl @@ -14,7 +14,7 @@ UUID::UUID(int) { } -/// construct an UUID from the binary represetation +/// construct an UUID from the binary representation ACE_INLINE UUID::UUID(const unsigned char* id) { @@ -24,7 +24,7 @@ UUID::UUID(const unsigned char* id) ACE_INLINE bool UUID::operator == (const UUID& other) const { - return ACE_OS::memcmp(this->rep_.uuid, other.rep_.uuid, BINRARY_LENGTH) == 0; + return ACE_OS::memcmp(this->rep_.uuid, other.rep_.uuid, BINARY_LENGTH) == 0; } ACE_INLINE |