summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-12-30 12:43:09 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-12-30 12:43:09 +0000
commitd7538fa194b9a8b7fe76de2f9dd62e8c06db2188 (patch)
tree7c094a7ec55dd47f65d24a58acadd1ce397d27dd
parent317acb45990170be7d58a019af7496cfe59e5ff5 (diff)
downloadATCD-d7538fa194b9a8b7fe76de2f9dd62e8c06db2188.tar.gz
ChangeLogTag: Fri Dec 30 12:40:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog5
-rw-r--r--ace/Object_Manager.cpp1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f5e02798233..a7b38145e86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 30 12:40:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/OS_NS_sys_time.inl:
+ Instead of return -1 return ACE_Time_Value(-1)
+
Fri Dec 30 12:34:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/tao_orb_tests.lst:
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index e05477198eb..5069939654c 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -17,6 +17,7 @@
#include "ace/Framework_Component.h"
#include "ace/Atomic_Op.h"
#include "ace/OS_NS_sys_time.h"
+#include "ace/Cleanup.h"
#if defined (ACE_HAS_TRACE)
#include "ace/Trace.h"