summaryrefslogtreecommitdiff
path: root/ACE/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/tests')
-rw-r--r--ACE/tests/Logging_Strategy_Test.cpp4
-rw-r--r--ACE/tests/Thread_Attrs_Test.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp
index 6b3c6a8394d..bf990348c0d 100644
--- a/ACE/tests/Logging_Strategy_Test.cpp
+++ b/ACE/tests/Logging_Strategy_Test.cpp
@@ -212,9 +212,11 @@ get_statistics (ACE_TCHAR *f_name)
ACE_TEXT (" File size (B): %d\n"),
buf.st_size));
+ time_t time = static_cast <time_t> (buf.st_mtime);
+
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT (" Time modified : %s\n"),
- ACE_OS::ctime (&buf.st_mtime)));
+ ACE_OS::ctime (&time)));
}
return buf.st_mtime;
diff --git a/ACE/tests/Thread_Attrs_Test.cpp b/ACE/tests/Thread_Attrs_Test.cpp
index 270401efdc7..7a9c8351b79 100644
--- a/ACE/tests/Thread_Attrs_Test.cpp
+++ b/ACE/tests/Thread_Attrs_Test.cpp
@@ -64,7 +64,7 @@ Cancel_Check::Cancel_Check (bool enable, bool async)
int
Cancel_Check::svc (void)
{
-#if defined (ACE_HAS_PTHREADS)
+#if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
int state;
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &state);
if (state == PTHREAD_CANCEL_ENABLE && !this->enable_req_)