ChangeLogTag: Mon Sep 21 09:20:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de>

4 files changed, 55 insertions, 45 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 57e52febf80..140327617e1 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -8,6 +8,15 @@ Mon Sep 21 09:20:00 1999  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
 	  Implemented the code necessary to do exception handling in 
 	  the reply stub.
 
+	* TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+	  Fixed some code generation problem with the ACE_NESTED_CLASS
+	  macro.
+
+	* examples/OBV/Typed_Events/Event_Types_impl.cpp,
+	  examples/OBV/Typed_Events/Event_Types_impl.h:
+	  Added the missing CORBA::Environment to the methods
+	  inheriting from the Skeleton.
+
 Mon Sep 20 19:11:44 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* tao/decode.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 298fd8abd09..a6743e468fd 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -89,9 +89,10 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
           ++n_inherits_downcastable;
           *os << "if (rval == 0)" << be_idt_nl
               << "rval = "; 
-          if (inherited->defined_in ())
+          if (inherited->defined_in ()->scope_node_type () == AST_Decl::NT_module)
             {
               be_decl *scope = be_scope::narrow_from_scope (inherited->defined_in ())->decl ();
+              // be_decl *scope = be_scope::narrow_from_scope (inherited->defined_in ())->decl ();
               *os << "ACE_NESTED_CLASS ("
                   << scope->name() << ","
                   << inherited->local_name () << ")";
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 101e58d964d..8970cbdf51c 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -53,7 +53,7 @@ Temperature_impl::~Temperature_impl ()
 }
 
 void
-Temperature_impl::do_print (void)
+Temperature_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
 {
   Event_impl::do_print ();
   // The timestamp
@@ -89,21 +89,21 @@ Position_impl::~Position_impl ()
 }
 
 void
-Position_impl::do_print (void)
+Position_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
 {
   Event_impl::do_print ();
   // The timestamp
 
   ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n",
-             this->x(), this->y(), this->z() ));
+             this->x(ACE_TRY_ENV), this->y(ACE_TRY_ENV), this->z(ACE_TRY_ENV) ));
 }
 
-CORBA::Float Position_impl::x ()  { return this->xyz()[0]; }
-void Position_impl::x (CORBA::Float x)   { this->xyz()[0] = x; }
-CORBA::Float Position_impl::y ()  { return this->xyz()[1]; }
-void Position_impl::y (CORBA::Float y)   { this->xyz()[1] = y; }
-CORBA::Float Position_impl::z ()  { return this->xyz()[2]; }
-void Position_impl::z (CORBA::Float z)   { this->xyz()[2] = z; }
+CORBA::Float Position_impl::x (CORBA::Environment &ACE_TRY_ENV)  { return this->xyz()[0]; }
+void Position_impl::x (CORBA::Float x, CORBA::Environment &ACE_TRY_ENV)   { this->xyz()[0] = x; }
+CORBA::Float Position_impl::y (CORBA::Environment &ACE_TRY_ENV)  { return this->xyz()[1]; }
+void Position_impl::y (CORBA::Float y, CORBA::Environment &ACE_TRY_ENV)   { this->xyz()[1] = y; }
+CORBA::Float Position_impl::z (CORBA::Environment &ACE_TRY_ENV)  { return this->xyz()[2]; }
+void Position_impl::z (CORBA::Float z, CORBA::Environment &ACE_TRY_ENV)   { this->xyz()[2] = z; }
 
 
 Position_factory::~Position_factory ()
@@ -134,7 +134,7 @@ Log_Msg_impl::~Log_Msg_impl ()
 }
 
 void
-Log_Msg_impl::do_print (void)
+Log_Msg_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
 {
   Event_impl::do_print ();
   // The timestamp
@@ -185,19 +185,19 @@ Event_List_Link_impl::~Event_List_Link_impl ()
 }
 
 Event*
-Event_List_Link_impl::get_event (void)
+Event_List_Link_impl::get_event (CORBA::Environment &ACE_TRY_ENV)
 {
   return this->my_event ();
 }
 
 Event_List_Link*
-Event_List_Link_impl::get_next_link (void)
+Event_List_Link_impl::get_next_link (CORBA::Environment &ACE_TRY_ENV)
 {
   return this->next ();
 }
 
 void
-Event_List_Link_impl::attach_next_link (Event_List_Link *n)
+Event_List_Link_impl::attach_next_link (Event_List_Link *n, CORBA::Environment &ACE_TRY_ENV)
 {
   this->next (n);
 }
@@ -227,7 +227,7 @@ Event_List_impl::~Event_List_impl ()
 }
 
 void
-Event_List_impl::store_event (Event* e)
+Event_List_impl::store_event (Event* e, CORBA::Environment &ACE_TRY_ENV)
 {
   // This operation should perform atomically and should
   // guard against the access to the list from another thread.
@@ -366,7 +366,7 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl ()
 
 
 CORBA::Boolean
-Temperature_Criterion_impl::is_critical (Event* e)
+Temperature_Criterion_impl::is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV)
 {
   // Downcast to a temperature.
   Temperature* t = Temperature::_downcast (e);
@@ -383,7 +383,7 @@ Temperature_Criterion_impl::is_critical (Event* e)
 
 
 void
-Temperature_Criterion_impl::do_print (void)
+Temperature_Criterion_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n",
              this->origin_id_ () ));
@@ -422,7 +422,7 @@ Position_Criterion_impl::~Position_Criterion_impl ()
 
 
 CORBA::Boolean
-Position_Criterion_impl::is_critical (Event* e)
+Position_Criterion_impl::is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV)
 {
   Position* p = Position::_downcast (e);
   // Is Event really a Position ?
@@ -443,7 +443,7 @@ Position_Criterion_impl::is_critical (Event* e)
 
 
 void
-Position_Criterion_impl::do_print (void)
+Position_Criterion_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_DEBUG((LM_DEBUG,
              "Alarm boundary for events with origin id %d is the box\n",
@@ -475,7 +475,7 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl ()
 
 
 CORBA::Boolean
-Log_Msg_Criterion_impl::is_critical (Event* e)
+Log_Msg_Criterion_impl::is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV)
 {
   Log_Msg* lm = Log_Msg::_downcast (e);
 
@@ -489,7 +489,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e)
 
 
 void
-Log_Msg_Criterion_impl::do_print (void)
+Log_Msg_Criterion_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_DEBUG((LM_DEBUG,
              "All log messages with urgency greater zero are registered.\n" ));
@@ -523,7 +523,7 @@ Criterion_List_impl::~Criterion_List_impl ()
 }
 
 void
-Criterion_List_impl::store_criterion (Criterion *c)
+Criterion_List_impl::store_criterion (Criterion *c, CORBA::Environment &ACE_TRY_ENV)
 {
   if (!my_list ())
     {
@@ -536,7 +536,7 @@ Criterion_List_impl::store_criterion (Criterion *c)
 }
 
 CORBA::Boolean
-Criterion_List_impl::is_critical (Event *e)
+Criterion_List_impl::is_critical (Event *e, CORBA::Environment &ACE_TRY_ENV)
 {
   // Try all criterions. Walking the list is efficient enough for
   // demonstration.
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index 2114e479bbd..db83bde653c 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -118,7 +118,7 @@ public:
 
   virtual ~Temperature_impl ();
 
-  virtual void do_print (void);
+  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
   // Overrides Event_impl::do_print (). Note that a new declaration
   // in IDL in a derived class is not allowed.
 };
@@ -144,15 +144,15 @@ public:
   Position_impl (Point &p);
   virtual ~Position_impl ();
 
-  virtual CORBA::Float x ();
-  virtual void x (CORBA::Float);
-  virtual CORBA::Float y ();
-  virtual void y (CORBA::Float);
-  virtual CORBA::Float z ();
-  virtual void z (CORBA::Float);
+  virtual CORBA::Float x (CORBA::Environment &ACE_TRY_ENV);
+  virtual void x (CORBA::Float, CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::Float y (CORBA::Environment &ACE_TRY_ENV);
+  virtual void y (CORBA::Float, CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::Float z (CORBA::Environment &ACE_TRY_ENV);
+  virtual void z (CORBA::Float, CORBA::Environment &ACE_TRY_ENV);
   //These are the attributes
 
-  virtual void do_print (void);
+  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
 };
 
 class Position_factory : public Position_init
@@ -177,7 +177,7 @@ public:
   Log_Msg_impl (CORBA::Short urgency_p, const char *message_p);
   virtual ~Log_Msg_impl ();
 
-  virtual void do_print (void);
+  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
 };
 
 class Log_Msg_factory : public Log_Msg_init
@@ -209,12 +209,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link,
   Event_List_Link_impl (Event *e);
   virtual ~Event_List_Link_impl ();
 
-  Event *get_event (void);
+  Event *get_event (CORBA::Environment &ACE_TRY_ENV);
 
  private:
-  Event_List_Link *get_next_link (void);
+  Event_List_Link *get_next_link (CORBA::Environment &ACE_TRY_ENV);
 
-  void attach_next_link (Event_List_Link * chain);
+  void attach_next_link (Event_List_Link * chain, CORBA::Environment &ACE_TRY_ENV);
   // Attach a chain at the end.
 };
 
@@ -238,9 +238,9 @@ class Event_List_impl : public virtual OBV_Event_List,
   Event_List_impl ();
   virtual ~Event_List_impl ();
 
-  void store_event (Event* e);
+  void store_event (Event* e, CORBA::Environment &ACE_TRY_ENV);
 
-  Event_List_Link *get_first_link();
+  Event_List_Link *get_first_link(CORBA::Environment &ACE_TRY_ENV);
   // The iterator needs it.
 
  private:
@@ -316,8 +316,8 @@ public:
 
   virtual ~Temperature_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e);
-  virtual void do_print (void);
+  CORBA::Boolean is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV);
+  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
 };
 
 class Temperature_Criterion_factory : public Temperature_Criterion_init
@@ -342,8 +342,8 @@ public:
                            Position *tr);
   virtual ~Position_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e);
-  virtual void do_print (void);
+  CORBA::Boolean is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV);
+  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
 };
 
 class Position_Criterion_factory : public Position_Criterion_init
@@ -364,8 +364,8 @@ public:
   Log_Msg_Criterion_impl ();
   virtual ~Log_Msg_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e);
-  virtual void do_print (void);
+  CORBA::Boolean is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV);
+  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
 };
 
 class Log_Msg_Criterion_factory : public Log_Msg_Criterion_init
@@ -384,8 +384,8 @@ class Criterion_List_impl : public virtual OBV_Criterion_List,
   Criterion_List_impl ();
   virtual ~Criterion_List_impl ();
 
-  void store_criterion (Criterion *c);
-  CORBA::Boolean is_critical (Event *e);
+  void store_criterion (Criterion *c, CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean is_critical (Event *e, CORBA::Environment &ACE_TRY_ENV);
 };