*** empty log message ***

2 files changed, 35 insertions, 12 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 5ca550c0d40..78bb856f8d0 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,13 @@
+Fri Apr 10 04:38:36 1998  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_typedef.cpp: The changes made by me in the
+	log entry mentioned just below had some flaws. I had sort of
+	blidly applied it to a case in the "visit_typedef" node of the
+	be_visitor_typedef_ci class. I was resetting the alias context
+	before the code generation action was taken as aooposed to doing
+	it after the action was taken. Thanks to Seth Widoff for sending
+	the bug report.
+
 Thu Apr  9 21:57:52 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* tao/POAS.cpp: Fixed up the POA to use the new
@@ -59,7 +69,7 @@ Thu Apr  9 19:25:44 1998  Michael Kircher <mk1@cs.wustl.edu>
 		  Had to conform to the new RtecScheduler.set ( ..) method,
 		  some parameters were added.
 
-        * docs/releasenotes/index.html: Enhanced description of the DOVE 
+        * docs/releasenotes/index.html: Enhanced description of the DOVE
 
 Thu Apr  9 10:07:34 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef.cpp
index 0b6001dc2d0..fcf0477b7da 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef.cpp
@@ -495,7 +495,7 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node)
                              "failed to accept visitor\n"
                              ),  -1);
         }
-      this->ctx_->alias (0);
+      this->ctx_->alias (0); // reset
     }
   else
     {
@@ -540,6 +540,7 @@ be_visitor_typedef_ch::visit_typedef (be_typedef *node)
                   << node->tc_name ()->last_component () << ";\n\n";
             }
         }
+      this->ctx_->tdef (0); // reset
     }
 
   return 0;
@@ -871,6 +872,16 @@ be_visitor_typedef_ci::visit_typedef (be_typedef *node)
                              "bad primitive base type\n"
                              ),  -1);
         }
+      // accept on this base type
+      if (bt->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_typedef_ch::"
+                             "visit_typedef - "
+                             "failed to accept visitor\n"
+                             ),  -1);
+        }
+
       this->ctx_->alias (0);
     }
   else
@@ -889,17 +900,18 @@ be_visitor_typedef_ci::visit_typedef (be_typedef *node)
                              "bad base type\n"
                              ),  -1);
         }
-    }
-  // accept on this base type
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_typedef_ch::"
-                         "visit_typedef - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
+      // accept on this base type
+      if (bt->accept (this) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_typedef_ch::"
+                             "visit_typedef - "
+                             "failed to accept visitor\n"
+                             ),  -1);
+        }
 
+      this->ctx_->tdef (0);
+    }
   return 0;
 }
 
@@ -1142,6 +1154,7 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node)
               << node->flatname () << ";\n\n";
 
         }
+      this->ctx_->tdef (0);
     }
 
   return 0;