summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-01-27 23:47:09 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-01-27 23:47:09 +0000
commitc40d61037db77a9bd2b902d99f5eb36eb1e7f0ff (patch)
treec97aeb4da85f0554ab7680d69d368d371366a707
parent867fd03302673cad923192427984e4004a726b54 (diff)
downloadATCD-c40d61037db77a9bd2b902d99f5eb36eb1e7f0ff.tar.gz
ChangeLogTag: Mon Jan 27 17:36:51 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog10
-rw-r--r--TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp8
2 files changed, 13 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 24ce98d3e11..1455ce29d30 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jan 27 17:36:51 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
+
+ Added missing switch case that prevented tao_ifr from
+ recognizing the element type of sequence<Object> in
+ an IDL file. Thanks to Andrey Nechypurenko@mchp
+ <Andrey.Nechypurenko@mchp.siemens.de> for sending in
+ the example IDL file that uncovered the problem.
+
Mon Jan 27 16:47:31 2003 Frank Hunleth <frank@hunleth.com>
* orbsvcs\tests\Miop\McastHello\run_test.pl: Fixed incorrect
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 22ad4af7af7..1c4451a2992 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -1435,15 +1435,13 @@ ifr_adding_visitor::predefined_type_to_pkind (AST_PredefinedType *node)
return CORBA::pk_any;
case AST_PredefinedType::PT_void:
return CORBA::pk_void;
+ case AST_PredefinedType::PT_object:
+ return CORBA::pk_objref;
case AST_PredefinedType::PT_pseudo:
{
const char *local_name = node->local_name ()->get_string ();
- if (!ACE_OS::strcmp (local_name, "Object"))
- {
- return CORBA::pk_objref;
- }
- else if (!ACE_OS::strcmp (local_name, "Principal"))
+ if (!ACE_OS::strcmp (local_name, "Principal"))
{
return CORBA::pk_Principal;
}