summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-11-07 12:45:05 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-11-07 12:45:05 +0000
commitd5cfbda7a374db1ad028ac920adbe33a6da3f131 (patch)
tree0f0bff48bf1110658b83fed91df61526891a1acb
parentcbd2b4a616348e7505fdc2e566b4a6b2c523bb54 (diff)
downloadATCD-d5cfbda7a374db1ad028ac920adbe33a6da3f131.tar.gz
Tue Nov 7 12:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3bd4d5086fa..6f57f676e1e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Nov 7 12:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Two_Objects/worker.{h,cpp}:
+ * tests/Two_Objects/server.cpp:
+ Renamed timeout to orb_timeout, resolves the warnings in the
+ rtems build where timeout is also something in the rtems
+ glue code.
+
Tue Nov 7 09:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp: