diff options
| author | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
| commit | 6aee5fcbe7473a3cbac12b7e8482a7b98bef8be3 (patch) | |
| tree | 91ec91d5c19eba9c2fe0e84b1c9dc7047a3de80e /dep/ACE_wrappers/ace/UUID.cpp | |
| parent | 2d2f433b4de1c35b22aaf07854fc0ee11fcb350d (diff) | |
| parent | f385747164c3fb278c92ef46fbd6c3da6590bbf0 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'dep/ACE_wrappers/ace/UUID.cpp')
| -rw-r--r-- | dep/ACE_wrappers/ace/UUID.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dep/ACE_wrappers/ace/UUID.cpp b/dep/ACE_wrappers/ace/UUID.cpp index 4ce2bcd0a4b..17785384957 100644 --- a/dep/ACE_wrappers/ace/UUID.cpp +++ b/dep/ACE_wrappers/ace/UUID.cpp @@ -461,7 +461,7 @@ namespace ACE_Utils // sequence. if (timestamp <= time_last_) { - uuid_state_.clock_sequence = static_cast<ACE_UINT16> + uuid_state_.clock_sequence = static_cast<ACE_UINT16> ((uuid_state_.clock_sequence + 1) & ACE_UUID_CLOCK_SEQ_MASK); } // If the system time ticked since the last UUID was |