diff options
Diffstat (limited to 'ace/System_Time.cpp')
| -rw-r--r-- | ace/System_Time.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp index dcb1480aa51..da8e6bbba07 100644 --- a/ace/System_Time.cpp +++ b/ace/System_Time.cpp @@ -22,7 +22,7 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname) ACE_OS::strcpy (this->poolname_, ACE_DEFAULT_BACKING_STORE); #else /* ACE_DEFAULT_BACKING_STORE */ - if (ACE::get_temp_dir (this->poolname_, + if (ACE_Lib_Find::get_temp_dir (this->poolname_, MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX { @@ -82,14 +82,14 @@ ACE_System_Time::get_master_system_time (ACE_UINT32 &time_out) // Try to find it void * temp; if (this->shmem_->find (ACE_DEFAULT_TIME_SERVER_STR, temp) == -1) - { - // No time entry in shared memory (meaning no Clerk exists) - // so return the local time of the host. - return this->get_local_system_time (time_out); - } + { + // No time entry in shared memory (meaning no Clerk exists) + // so return the local time of the host. + return this->get_local_system_time (time_out); + } else - // Extract the delta time. - this->delta_time_ = (long *) temp; + // Extract the delta time. + this->delta_time_ = (long *) temp; } ACE_UINT32 local_time; @@ -141,3 +141,4 @@ template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_M #pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> > #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + |