diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-06 20:11:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-06 20:11:12 +0100 |
| commit | a5153ed8e5136ca039657eb476ea21cc230ed393 (patch) | |
| tree | ef326cd8ecd31acd8a04ba59996687f5ea8f0637 | |
| parent | 1378f952ac8380b0c624a802ec1d747426d59197 (diff) | |
| parent | 3146fe23c9e8e7ed65d05814128b4b6eca6f98ab (diff) | |
| download | ATCD-a5153ed8e5136ca039657eb476ea21cc230ed393.tar.gz | |
Merge pull request #1403 from jwillemsen/jwi-ACE_HAS_DINKUM_STL
Cleanup usage of ACE_HAS_DINKUM_STL, not set anymore in any config file
| -rw-r--r-- | ACE/ace/OS_NS_stdio.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/README | 1 | ||||
| -rw-r--r-- | ACE/ace/os_include/os_time.h | 14 |
3 files changed, 7 insertions, 12 deletions
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 1cd8d54567b..f17002c630e 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -1127,7 +1127,6 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) { # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ - defined (ACE_HAS_DINKUM_STL) || \ defined (ACE_HAS_VSWPRINTF) || \ (defined (_MSC_VER) && !defined (ACE_HAS_WINCE)) @@ -1156,7 +1155,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) ACE_UNUSED_ARG (argptr); ACE_NOTSUP_RETURN (-1); -# endif /* XPG5 || ACE_HAS_DINKUM_STL */ +# endif /* XPG5 */ } #endif /* ACE_HAS_WCHAR */ @@ -1208,7 +1207,6 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis { # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ - (defined (ACE_HAS_DINKUM_STL)) || \ defined (ACE_HAS_VSWPRINTF) || \ defined (ACE_WIN32) diff --git a/ACE/ace/README b/ACE/ace/README index 7830e2d9fe7..7571ccbfef3 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -139,7 +139,6 @@ ACE_HAS_ALT_CUSERID Use ACE's alternate cuserid() ACE_LACKS_PWD_FUNCTIONS to be undefined and that the geteuid() system call exists. -ACE_HAS_DINKUM_STL Using the Dinkum STL library ACE_DEFAULT_THREAD_KEYS Number of TSS keys, with ACE_HAS_TSS_EMULATION _only_. Defaults to 64. diff --git a/ACE/ace/os_include/os_time.h b/ACE/ace/os_include/os_time.h index b6d613b7abb..26095d91e9f 100644 --- a/ACE/ace/os_include/os_time.h +++ b/ACE/ace/os_include/os_time.h @@ -38,18 +38,16 @@ # include /**/ <time.h> #endif /* !ACE_LACKS_TIME_H */ -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \ - (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0) +#if defined (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB) && \ + (ACE_USES_STD_NAMESPACE_FOR_STDC_LIB != 0) using std::tm; -# if !defined (ACE_HAS_DINKUM_STL) -# if defined (ACE_WIN32) +# if defined (ACE_WIN32) using std::_timezone; -# else +# else using std::timezone; -# endif -# endif +# endif /* ACE_WIN32 */ using std::difftime; -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */ +#endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */ # if !defined (ACE_HAS_POSIX_TIME) // Definition per POSIX. |