summaryrefslogtreecommitdiff
path: root/ACE/ace/UUID.cpp
diff options
context:
space:
mode:
authormitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2012-08-08 22:18:09 +0000
committermitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2012-08-08 22:18:09 +0000
commit9e2e5f30a6814f0ae79723141837ce4c006d0a8a (patch)
tree55072664b9e6000b90d580998e63c74a2bd99a2b /ACE/ace/UUID.cpp
parent94bbde6132926d65bedb83b6788d30a33e90a8ec (diff)
downloadATCD-9e2e5f30a6814f0ae79723141837ce4c006d0a8a.tar.gz
ChangeLogTag: Wed Aug 8 22:13:55 UTC 2012 Adam Mitz <mitza@ociweb.com>
Diffstat (limited to 'ACE/ace/UUID.cpp')
-rw-r--r--ACE/ace/UUID.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
index 09285e7f523..b8b5f86f0c0 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -359,7 +359,7 @@ namespace ACE_Utils
uuid.time_mid (static_cast<ACE_UINT16> ((timestamp >> 32) & 0xFFFF));
ACE_UINT16 tHAV = static_cast<ACE_UINT16> ((timestamp >> 48) & 0xFFFF);
- tHAV |= (version << 12);
+ tHAV = static_cast<ACE_UINT16> (tHAV | (version << 12));
uuid.time_hi_and_version (tHAV);
u_char cseqHAV;
@@ -367,7 +367,7 @@ namespace ACE_Utils
cseqHAV = static_cast<u_char> ((clock_sequence & 0x3f00) >> 8);
uuid_state_.timestamp = timestamp;
- cseqHAV |= variant;
+ cseqHAV = static_cast<u_char> (cseqHAV | variant);
uuid.clock_seq_hi_and_reserved (cseqHAV);
uuid.node (uuid_state_.node);