Skip to content

[ACE 6] Restore ACE_STD_NAMESPACE lost in merge of #2372 #2375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mitza-oci merged 1 commit into from
May 1, 2025
Merged

[ACE 6] Restore ACE_STD_NAMESPACE lost in merge of #2372 #2375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ACE/ace/OS_NS_time.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ ACE_OS::strftime (char *s, size_t maxsize, const char *format,
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wformat-nonliteral"
# endif
return std::strftime (s, maxsize, format, timeptr);
return ACE_STD_NAMESPACE::strftime (s, maxsize, format, timeptr);
# ifdef __GNUC__
# pragma GCC diagnostic pop
# endif
Expand Down