summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-18 08:20:08 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-04-18 08:20:08 +0000
commit083824e40a9c9b82cb88520f564a3c8e4d18b0f1 (patch)
tree4f103242eac83584a20d5551b3d3ea4b64a1c7b1
parent1d12c129be1eaf51472160c851f124743dbc5f23 (diff)
downloadATCD-083824e40a9c9b82cb88520f564a3c8e4d18b0f1.tar.gz
ChangeLogTag:Tue Apr 18 03:17:37 2000 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a8
-rw-r--r--TAO/tao/LocalObject.cpp6
-rw-r--r--TAO/tao/corba.h1
3 files changed, 10 insertions, 5 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 3a6aa1044f3..3637ced020f 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Tue Apr 18 03:17:37 2000 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * tao/corba.h: Included "tao/LocalObject" in this file.
+
+ * tao/LocalObject.h:
+ * tao/LocalObject.cpp: Changed <_is_a> operation back to throw
+ NO_IMPLEMENT exception.
+
Tue Apr 18 02:03:12 2000 Nanbor Wang <nanbor@cs.wustl.edu>
* TAO_IDL/be/be_interface.cpp:
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index b3874f0e4e9..7bff5692b06 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -51,11 +51,7 @@ CORBA::Boolean
CORBA::LocalObject::_is_a (const CORBA::Char *type_id,
CORBA::Environment &)
{
- if ((!ACE_OS::strcmp ((char *)type_id, "IDL:omg.org/CORBA/LocalObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)type_id, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return 0;
+ ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
}
const char*
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 36305c7615f..38bd014ceea 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -44,6 +44,7 @@
#include "tao/Request.h"
#include "tao/Server_Request.h"
#include "tao/Object.h"
+#include "tao/LocalObject.h"
#include "tao/Context.h"
#include "tao/Typecode.h"