diff options
author | Olli Savia <ops@iki.fi> | 2016-06-10 19:01:22 +0300 |
---|---|---|
committer | Olli Savia <ops@iki.fi> | 2016-06-10 19:01:22 +0300 |
commit | 404dd3030866ecaae7663f8382ccb5b30b244637 (patch) | |
tree | 6d41d1a43f8f74a4b0b5c32fcf275fc6cf0ed326 | |
parent | 93679e1d90c81ee76254a959d943ecc616e8ac84 (diff) | |
download | ATCD-404dd3030866ecaae7663f8382ccb5b30b244637.tar.gz |
Do not use ACE_STD_NAMESPACE macro
-rw-r--r-- | ACE/ace/OS_NS_stdlib.h | 2 | ||||
-rw-r--r-- | ACE/ace/OS_NS_time.h | 16 | ||||
-rw-r--r-- | ACE/ace/OS_NS_time.inl | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index 95e65410297..a6ffa8eb4f4 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -83,7 +83,7 @@ inline int ace_rand_r_helper (unsigned *seed) return rand_r (seed); #undef rand_r #else - return ACE_STD_NAMESPACE::rand_r (seed); + return ::rand_r (seed); #endif /* rand_r */ } diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 4ef60a3c8ab..f995fdd46b1 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -102,27 +102,17 @@ inline char *ace_asctime_r_helper (const struct tm *t, char *buf) return asctime_r (t, buf); #undef asctime_r #else - return ACE_STD_NAMESPACE::asctime_r (t, buf); + return ::asctime_r (t, buf); #endif /* defined (asctime_r) */ } -inline char *ace_ctime_r_helper (const time_t *t, char *bufp) -{ -#if defined (ctime_r) - return ctime_r (t, bufp); -#undef ctime_r -#else - return ACE_STD_NAMESPACE::ctime_r (t, bufp); -#endif /* defined (ctime_r) */ -} - inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res) { #if defined (gmtime_r) return gmtime_r (clock, res); #undef gmtime_r #else - return ACE_STD_NAMESPACE::gmtime_r (clock, res); + return ::gmtime_r (clock, res); #endif /* defined (gmtime_r) */ } @@ -132,7 +122,7 @@ inline struct tm *ace_localtime_r_helper (const time_t *clock, struct tm *res) return localtime_r (clock, res); #undef localtime_r #else - return ACE_STD_NAMESPACE::localtime_r (clock, res); + return ::localtime_r (clock, res); #endif /* defined (localtime_r) */ } diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index 48468ce2837..f066be30b60 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -143,7 +143,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen) return 0; } # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) - return ace_ctime_r_helper (t, bufp); + ACE_OSCALL (::ctime_r (t, bufp), char *, 0, bufp); # else /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */ # if defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R) |