summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ace/OS_NS_time.cpp2
-rw-r--r--ACE/tests/OS_Test.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp
index 5c485d9c586..b15714866b2 100644
--- a/ACE/ace/OS_NS_time.cpp
+++ b/ACE/ace/OS_NS_time.cpp
@@ -365,8 +365,6 @@ ACE_OS::strptime_emulation (const char *buf, const char *format, struct tm *tm)
if (!buf || !format)
return 0;
- ACE_OS::memset (tm, 0, sizeof (struct tm));
-
while (format[fi] != '\0')
{
if (percent)
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index bee41329ab7..0a2fa16e278 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -644,6 +644,7 @@ strptime_test (void)
int error_count = 0;
const char* original_time = "2008-06-21 23:45";
tm lTime;
+ ACE_OS::memset (&lTime, 0, sizeof (struct tm));
ACE_OS::strptime(original_time, "%Y-%m-%d %H:%M", &lTime);
lTime.tm_isdst = 0; // do not change due to daylight saving time
time_t lNewTime = ACE_OS::mktime(&lTime);