ChangeLogTag:Sat Feb 27 20:05:10 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

4 files changed, 23 insertions, 17 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 75443a74eda..8bb00d0d149 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,14 @@
+Sat Feb 27 20:05:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_union_branch/public_ci.cpp: 
+	* TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp: 
+	  Removed unused variables.
+
+	* TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: 
+	  The temporary used to read the discriminant must be declared
+	  using the fully qualified name of the type, because the
+	  operator>> is in the global scope.
+
 Fri Feb 26 23:41:08 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* TAO_IDL/driver/drv_preproc.cpp (DRV_pre_proc): Oops, unlinking
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
index 60882c05797..3be397e784e 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
@@ -98,7 +98,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
     be_type::narrow_from_decl (node->disc_type ());
 
   // Generate a temporary to store the discriminant
-  *os << disc_type->nested_type_name (node)
+  *os << disc_type->fullname ()
       << " " << "_tao_discriminant;" << be_nl
       << "if ( !(strm >> _tao_discriminant) )" << be_idt_nl
       << "return 0;" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index 336d86eb8ed..c10d8d7b258 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -49,9 +49,6 @@ be_visitor_union_branch_public_assign_cs::~be_visitor_union_branch_public_assign
 int
 be_visitor_union_branch_public_assign_cs::visit_union_branch (be_union_branch *node)
 {
-  be_union_branch *ub =
-    this->ctx_->be_node_as_union_branch (); // get union branch
-
   TAO_OutStream *os = this->ctx_->stream ();
 
   // This visitor is used when we are generating the copy ctor and
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index 2671d1184cd..98e8e6164d2 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -171,11 +171,9 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
-      AST_Expression *e = ub->label ()->label_val ();
-
       *os << "// set the discriminant val" << be_nl;
 
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -241,7 +239,7 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
     {
       *os << "// set the discriminant val" << be_nl;
 
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -309,7 +307,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       *os << "// set the discriminant val" << be_nl;
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -379,7 +377,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       *os << "// set the discriminant val" << be_nl;
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -450,7 +448,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type (be_predefined_type *no
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       *os << "// set the discriminant val" << be_nl;
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -599,7 +597,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       *os << "// set the discriminant val" << be_nl;
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -666,7 +664,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *)
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       *os << "// set the discriminant val" << be_nl;
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -694,7 +692,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *)
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       *os << "// set the discriminant val" << be_nl;
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -723,7 +721,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *)
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       *os << "// set the discriminant val" << be_nl;
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -821,7 +819,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       *os << "// set the discriminant val" << be_nl;
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";
@@ -957,7 +955,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
       *os << "// set the discriminant val" << be_nl;
-      *os << "this->_reset ("; 
+      *os << "this->_reset (";
       ub->gen_label_value (os);
       *os << ", 0);" << be_nl
           << "this->disc_ = ";