summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-12-10 15:12:06 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-12-10 15:12:06 +0000
commitad7e175c4dce40aaed20baf979ebeb759dac7384 (patch)
tree83c5a43440461ff438d583c4d274edc8059d6a0d
parentaab74b204c4cc6c42dda0bce070096bc88f9da14 (diff)
downloadATCD-ad7e175c4dce40aaed20baf979ebeb759dac7384.tar.gz
ChangeLogTag: Wed Dec 10 15:09:13 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog5
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a55e1ef3b6f..0b4c0dccb07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 10 15:09:13 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/TMCast/Member/member.cpp:
+ Added missing includes
+
Wed Dec 10 13:39:53 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Log_Msg.cpp:
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index 41f3da2b6c8..9db268f73bc 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -36,11 +36,10 @@ Smart_Diamond_Top_Proxy::shape ( ACE_ENV_SINGLE_ARG_DECL)
{
ACE_DEBUG ((LM_DEBUG, "Smart_proxy: This is "));
- CORBA::Short retval = 0;
char *ans= 0;
ACE_TRY
{
- ans =
+ ans =
ACE_OS::strdup (
TAO_Diamond_Top_Smart_Proxy_Base::shape (
ACE_ENV_SINGLE_ARG_PARAMETER