summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Savia <ops@iki.fi>2016-09-03 00:31:11 +0300
committerOlli Savia <ops@iki.fi>2016-09-03 00:31:11 +0300
commit044091d7873086e1ecd54808e7652e9ae0025d31 (patch)
treee87bf763d2197e723e93dbd304d24865fd569546
parent404dd3030866ecaae7663f8382ccb5b30b244637 (diff)
downloadATCD-044091d7873086e1ecd54808e7652e9ae0025d31.tar.gz
Readded ACE_STD_NAMESPACE::
-rw-r--r--ACE/ace/OS_NS_stdlib.h2
-rw-r--r--ACE/ace/OS_NS_time.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h
index a6ffa8eb4f4..95e65410297 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 ::rand_r (seed);
+ return ACE_STD_NAMESPACE::rand_r (seed);
#endif /* rand_r */
}
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h
index f995fdd46b1..013276eb00a 100644
--- a/ACE/ace/OS_NS_time.h
+++ b/ACE/ace/OS_NS_time.h
@@ -102,7 +102,7 @@ inline char *ace_asctime_r_helper (const struct tm *t, char *buf)
return asctime_r (t, buf);
#undef asctime_r
#else
- return ::asctime_r (t, buf);
+ return ACE_STD_NAMESPACE::asctime_r (t, buf);
#endif /* defined (asctime_r) */
}
@@ -112,7 +112,7 @@ inline struct tm *ace_gmtime_r_helper (const time_t *clock, struct tm *res)
return gmtime_r (clock, res);
#undef gmtime_r
#else
- return ::gmtime_r (clock, res);
+ return ACE_STD_NAMESPACE::gmtime_r (clock, res);
#endif /* defined (gmtime_r) */
}
@@ -122,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 ::localtime_r (clock, res);
+ return ACE_STD_NAMESPACE::localtime_r (clock, res);
#endif /* defined (localtime_r) */
}