From ab92e52aafe3fbe604bd5b78d0a9f19a191084af Mon Sep 17 00:00:00 2001
From: coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Thu, 16 Mar 2000 23:21:34 +0000
Subject: ChangeLogTag:Thu Mar 16 17:16:53 2000  Carlos O'Ryan 
 <coryan@cs.wustl.edu>

---
 TAO/ChangeLogs/ChangeLog-02a   | 12 ++++++++++++
 TAO/tao/Any.cpp                |  4 ++--
 TAO/tao/orb.idl                |  4 ++++
 TAO/tests/Param_Test/anyop.cpp | 19 +++++--------------
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index df7780c5dc1..4a735fb948a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Thu Mar 16 17:16:53 2000  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/Any.cpp:
+	  Fixed some code to work in platforms without exceptions.
+
+	* tao/orb.idl:
+	  Added a missing #pragma prefix ""
+
+	* tests/Param_Test/anyop.cpp:
+	  Fixed so the Object Reference test works on any host.  Not very
+	  elegant or portable, but it does the job.
+
 Mon Mar 13 15:37:05 2000  Carlos O'Ryan  <coryan@uci.edu>
 
 	* tao/TAO.dsp:
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 16fb1b2f369..1cfebf5c304 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -1615,11 +1615,11 @@ operator>> (TAO_InputCDR &cdr,
       // Skip over the next aregument.
       CORBA::TypeCode::traverse_status status =
         cdr.skip (tc.in (), ACE_TRY_ENV);
-      ACE_CHECK;
+      ACE_TRY_CHECK;
 
       if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          ACE_THROW (CORBA::MARSHAL ());
+          return 0;
         }
 
       // This will be the end of the new message block.
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index a1ca0c37421..e5bbf409db2 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -7,10 +7,14 @@
 
 #include <Policy.pidl>
 
+#pragma prefix "omg.org"
+
 module CORBA
 {
   typedef unsigned long ServiceOption;
   typedef unsigned long ServiceDetailType;
 };
 
+#pragma prefix ""
+
 #endif /* TAO_CORBA_IDL */
diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp
index fc3f6870bb7..616030b252b 100644
--- a/TAO/tests/Param_Test/anyop.cpp
+++ b/TAO/tests/Param_Test/anyop.cpp
@@ -89,27 +89,18 @@ main (int argc, char *argv[])
 
           {
             CORBA::Object_var obj =
-              orb->string_to_object ("IOR:010000001b00000049444c3a6f6d"
-                                     "672e6f72672f506172616d5f54657374"
-                                     "3a312e30000001000000000000008400"
-                                     "0000010101cd0a000000474c414d4452"
-                                     "494e47008f053000000014010f004e55"
-                                     "50000000130000000001000000006368"
-                                     "696c645f706f61000000000001000000"
-                                     "706172616d5f74657374030000000000"
-                                     "00000800000001cdcdcd004f41540100"
-                                     "00001400000001cdcdcd010001000000"
-                                     "00000901010000000000004f41540400"
-                                     "000001cd0000",
+              orb->string_to_object ("iioploc://localhost:1234/Foo/Bar",
                                      ACE_TRY_ENV);
             ACE_TRY_CHECK;
 
             Param_Test_var param_test =
               Param_Test::_unchecked_narrow (obj.in (),
-                                         ACE_TRY_ENV);
+                                             ACE_TRY_ENV);
             ACE_TRY_CHECK;
+            TAO_Stub *stub = param_test->_stubobj ();
+            stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0");
 
-            any <<= Param_Test::_duplicate (param_test.in ());
+            any <<= param_test.in ();
 
             Param_Test_ptr o;
             if (!(any >>= o))
-- 
cgit v1.2.1