summaryrefslogtreecommitdiff
path: root/ACE/ace/UUID.inl
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2015-11-06 17:07:11 -0600
committerAdam Mitz <mitza@ociweb.com>2015-11-06 17:07:11 -0600
commitac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b (patch)
tree0e70d1f51c39e688a05a6cdc2af58408222e4a0d /ACE/ace/UUID.inl
parent5272b5b81f92c298cb998b5bb0b0dbca3e7f29fe (diff)
downloadATCD-ac5e1702c9f9bee9f1f7bfce8c1a6f3847ea6b4b.tar.gz
Merged branch ace-face-safety (FACE Safety Profile import from OCITAO).
Diffstat (limited to 'ACE/ace/UUID.inl')
-rw-r--r--ACE/ace/UUID.inl2
1 files changed, 2 insertions, 0 deletions
diff --git a/ACE/ace/UUID.inl b/ACE/ace/UUID.inl
index a497da64667..cf3a3c150e9 100644
--- a/ACE/ace/UUID.inl
+++ b/ACE/ace/UUID.inl
@@ -153,11 +153,13 @@ namespace ACE_Utils
this->pid_ = pid;
}
+#ifndef ACE_LACKS_SSCANF
ACE_INLINE void
UUID::from_string (const ACE_CString& uuidString)
{
this->from_string_i (uuidString);
}
+#endif
ACE_INLINE bool
UUID::operator == (const UUID &right) const