summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-09-01 10:01:17 +0000
committervzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-09-01 10:01:17 +0000
commit7c6860d6fb7dd4d39da0c2c4c88152877cea58f4 (patch)
tree58d89c8d38e17c5f93e7a052d64cd69b65a03217
parent5eac39d35fae44e201b4e5ad6cc641357cad7c6b (diff)
downloadATCD-7c6860d6fb7dd4d39da0c2c4c88152877cea58f4.tar.gz
Wed Sep 1 09:59:42 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com>
* tests/Time_Value_Test.cpp: Fixed compile warning on QNX. time_t on QNX is defined as unsigned int.
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/tests/Time_Value_Test.cpp2
2 files changed, 8 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b0285e56184..a5f585fe8c8 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,7 +1,13 @@
+Wed Sep 1 09:59:42 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com>
+
+ * tests/Time_Value_Test.cpp:
+ Fixed compile warning on QNX. time_t on QNX is defined as unsigned
+ int.
+
Tue Aug 31 16:53:07 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
* THANKS:
-
+
Added Catherine L. Paquin <catherine dot paquin at ngc dot com>.
Tue Aug 31 14:40:17 UTC 2010 Adam Mitz <mitza@ociweb.com>
diff --git a/ACE/tests/Time_Value_Test.cpp b/ACE/tests/Time_Value_Test.cpp
index 3e2e75b7841..a6631efdd64 100644
--- a/ACE/tests/Time_Value_Test.cpp
+++ b/ACE/tests/Time_Value_Test.cpp
@@ -168,7 +168,7 @@ run_main (int, ACE_TCHAR *[])
ost << ACE_Time_Value(1,1);
ACE_ASSERT( ost.str() == "1.000001" );
ost.str("");
- ost << ACE_Time_Value(-1,-1);
+ ost << ACE_Time_Value(static_cast<time_t>(-1),-1);
ACE_ASSERT( ost.str() == "-1.000001" );
ost.str("");
ost << ACE_Time_Value(0,1);