summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Cleeland <chris.cleeland@gmail.com>1998-01-23 22:52:24 +0000
committerChris Cleeland <chris.cleeland@gmail.com>1998-01-23 22:52:24 +0000
commit87b992ff8b2f13c6afc12c018a3df90f92ac7861 (patch)
treea94455328e9a2f8f82898a36050b00f07085ef7c
parent4689ce6d718bd0e4cf0220845a80861169b10b2d (diff)
downloadATCD-87b992ff8b2f13c6afc12c018a3df90f92ac7861.tar.gz
* tests/Param_Test/Makefile: Moved LDFLAGS up, included the
rules.tao.GNU, and removed the dependencies which were causing me no end of grief. * tests/Cubit/TAO/IDL_Cubit/svr.cpp (main): Changed the check on return value from resolve_initial_references() to use the CORBA::is_nil() check.
-rw-r--r--TAO/ChangeLog-98c13
-rw-r--r--TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp2
2 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 0caa5ff31aa..f29a256770b 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,16 @@
+Fri Jan 23 16:49:19 1998 Chris Cleeland <cleeland@cs.wustl.edu>
+
+ * tests/Param_Test/{server.cpp,param_test_i.h,param_test_i.cpp}:
+ Updated to compile with new POA.
+
+ * tests/Param_Test/Makefile: Moved LDFLAGS up, included the
+ rules.tao.GNU, and removed the dependencies which were causing me
+ no end of grief.
+
+ * tests/Cubit/TAO/IDL_Cubit/svr.cpp (main): Changed the check on
+ return value from resolve_initial_references() to use the
+ CORBA::is_nil() check.
+
Fri Jan 23 16:43:12 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
* orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp
index 70ecebc8711..7b82c142e95 100644
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp
+++ b/TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
// Initialize the Object Adapter
CORBA::Object_var poa_object =
orb->resolve_initial_references("RootPOA");
- if (poa_object == 0)
+ if (CORBA::is_nil(poa_object.in()))
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to initialize the POA.\n"),
1);