Skip to content

Commit 76558e1

Browse files
authored
Merge pull request #2375 from mitza-oci/ace6-fix-merge-osnstime
[ACE 6] Restore ACE_STD_NAMESPACE lost in merge of #2372
2 parents 63e7cc1 + 0d3aacd commit 76558e1

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

ACE/ace/OS_NS_time.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ ACE_OS::strftime (char *s, size_t maxsize, const char *format,
441441
# pragma GCC diagnostic push
442442
# pragma GCC diagnostic ignored "-Wformat-nonliteral"
443443
# endif
444-
return std::strftime (s, maxsize, format, timeptr);
444+
return ACE_STD_NAMESPACE::strftime (s, maxsize, format, timeptr);
445445
# ifdef __GNUC__
446446
# pragma GCC diagnostic pop
447447
# endif

0 commit comments

Comments
 (0)