diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-02-25 10:03:36 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-02-25 10:03:36 +0100 |
| commit | fe1c0ce2c31004df75b77317b42891ec9531ef72 (patch) | |
| tree | 2be849f51b69d7a84b17571e9297f0cd6202dcf4 | |
| parent | 647e37504e79bc35991304514632f0eae3c24815 (diff) | |
| download | ATCD-fe1c0ce2c31004df75b77317b42891ec9531ef72.tar.gz | |
Removed workaround for older msvc14 ctp releases, see bugzilla 4169
| -rw-r--r-- | ACE/ace/OS_NS_time.inl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index be68f3babad..ab3fd7ec7bb 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -371,7 +371,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res) ACE_OS_TRACE ("ACE_OS::gmtime_r"); #if defined (ACE_HAS_REENTRANT_FUNCTIONS) ACE_OSCALL_RETURN (::gmtime_r (t, res), struct tm *, 0); -#elif defined (ACE_HAS_TR24731_2005_CRT) && !defined (ACE_WIN32_VC14) +#elif defined (ACE_HAS_TR24731_2005_CRT) struct tm *tm_p = res; ACE_SECURECRTCALL (gmtime_s (res, t), struct tm *, 0, tm_p); return tm_p; |