ChangeLogTag:Mon Nov 24 20:40:47 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu>

10 files changed, 31 insertions, 77 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 83f83f1e037..06fccb77a29 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,23 @@
+Mon Nov 24 20:40:47 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
+
+	* tao/corbacom.i: 
+	  Fixed string allocation problem for String_var(char*): if it
+	  does not copy the string we run into problems with the
+	  demarshalling code.
+
+	* orbsvcs/lib/Event_Utilities.cpp: 
+	* orbsvcs/lib/Event_Utilities.h: 
+	* orbsvcs/lib/Event_Utilities.i: 
+	* orbsvcs/lib/RtecEventChannelAdmin.idl: 
+	* orbsvcs/lib/RtecEventChannelAdminC.cpp: 
+	* orbsvcs/lib/RtecEventChannelAdminC.h: 
+	  Removed the unused forward_event parameter in the ConsumerQoS.
+
+	* orbsvcs/lib/RtecSchedulerC.h: 
+	* orbsvcs/lib/RtecSchedulerC.i: 
+	  Hand crafted the T_out constructors to take a "const T_out&"
+	  instead of just "T_out&".
+
 Sat Nov 22 18:21:10 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
 
 	* TAO_IDL/be_include/be_codegen.h, be/be_codegen.cpp: Added a
diff --git a/TAO/orbsvcs/lib/Event_Utilities.cpp b/TAO/orbsvcs/lib/Event_Utilities.cpp
index b5543220500..75394f34e2b 100644
--- a/TAO/orbsvcs/lib/Event_Utilities.cpp
+++ b/TAO/orbsvcs/lib/Event_Utilities.cpp
@@ -11,10 +11,6 @@ ACE_ConsumerQOS_Factory::ACE_ConsumerQOS_Factory (void) :
   qos_ (),
   designator_set_ (0)
 {
-  qos_.forward_event.source_ = 0;
-  qos_.forward_event.type_ = 0;
-  qos_.forward_event.time_ = 0;
-  // TODO: qos_.forward_event.data_.lval (0);
 }
 
 ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory (void)
@@ -81,7 +77,6 @@ void
 ACE_ConsumerQOS_Factory::debug (const RtecEventChannelAdmin::ConsumerQOS& qos)
 {
   ACE_DEBUG ((LM_DEBUG, "ConsumerQOS { \n"));
-  event_debug ("    forward", qos.forward_event);
 
   for (u_int i = 0; i < qos.dependencies.length (); ++i)
     {
diff --git a/TAO/orbsvcs/lib/Event_Utilities.h b/TAO/orbsvcs/lib/Event_Utilities.h
index e14e13a9046..ea6ab98f631 100644
--- a/TAO/orbsvcs/lib/Event_Utilities.h
+++ b/TAO/orbsvcs/lib/Event_Utilities.h
@@ -162,13 +162,6 @@ public:
   int insert_act (RtecEventComm::EventData act);
   // This will be inserted as type ACE_ES_EVENT_ACT.
 
-  int forward (RtecEventComm::EventType type);
-  // When this is called, the events dependencies inserted *will*
-  // *not* be forwarded to the consumer.  Instead, when the
-  // dependencies are satisfied, an event of type <type> will be
-  // generated and forwarded to consumers that register to receive
-  // <type> events.
-
   // = Conversion operators.  The Event Channel takes ConsumerQOS
   // objects.
 
diff --git a/TAO/orbsvcs/lib/Event_Utilities.i b/TAO/orbsvcs/lib/Event_Utilities.i
index da29c457171..030cb0273eb 100644
--- a/TAO/orbsvcs/lib/Event_Utilities.i
+++ b/TAO/orbsvcs/lib/Event_Utilities.i
@@ -60,13 +60,6 @@ ACE_ConsumerQOS_Factory::insert_act (RtecEventComm::EventData act)
   return this->insert (dependency);
 }
 
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::forward (RtecEventComm::EventType type)
-{
-  qos_.forward_event.type_ = type;
-  return 0;
-}
-
 ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS& 
 ACE_ConsumerQOS_Factory::get_ConsumerQOS (void)
 {
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdmin.idl b/TAO/orbsvcs/lib/RtecEventChannelAdmin.idl
index 4045a5a50e9..ec0147abbb9 100644
--- a/TAO/orbsvcs/lib/RtecEventChannelAdmin.idl
+++ b/TAO/orbsvcs/lib/RtecEventChannelAdmin.idl
@@ -19,7 +19,6 @@ module RtecEventChannelAdmin {
 
   struct ConsumerQOS {
     DependencySet dependencies;
-    RtecEventComm::Event forward_event;
   };
 
   struct Publication {
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp b/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp
index 8bcbbac3cd1..694e0b7a276 100644
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp
+++ b/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp
@@ -298,7 +298,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin_ConsumerQOS[] =
   TAO_ENCAP_BYTE_ORDER, // byte order
   42, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f436f, 0x6e73756d, 0x6572514f, 0x533a312e, 0x30000000,  // repository ID = IDL:RtecEventChannelAdmin/ConsumerQOS:1.0
   12, 0x436f6e73, 0x756d6572, 0x514f5300,  // name = ConsumerQOS
-  2, // member count
+  1, // member count
     13, 0x64657065, 0x6e64656e, 0x63696573, 0x0,  // name = dependencies
     CORBA::tk_alias, // typecode kind for typedefs
     664, // encapsulation length
@@ -367,51 +367,7 @@ static const CORBA::Long _oc_RtecEventChannelAdmin_ConsumerQOS[] =
             CORBA::tk_long,
 
             0,
-    14, 0x666f7277, 0x6172645f, 0x6576656e, 0x74000000,  // name = forward_event
-    CORBA::tk_struct, // typecode kind
-    396, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-      6, 0x4576656e, 0x74000000,  // name = Event
-      4, // member count
-        8, 0x736f7572, 0x63655f00,  // name = source_
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-          14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-          CORBA::tk_long,
-
-        6, 0x74797065, 0x5f000000,  // name = type_
-        CORBA::tk_alias, // typecode kind for typedefs
-        60, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-          10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-          CORBA::tk_long,
-
-        6, 0x74696d65, 0x5f000000,  // name = time_
-        CORBA::tk_alias, // typecode kind for typedefs
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-          5, 0x54696d65, 0x0,  // name = Time
-          CORBA::tk_long,
-
-        6, 0x64617461, 0x5f000000,  // name = data_
-        CORBA::tk_struct, // typecode kind
-        84, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-          10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-          2, // member count
-            2, 0x78000000,  // name = x
-            CORBA::tk_long,
-
-            2, 0x79000000,  // name = y
-            CORBA::tk_long,
-
-            };
+};
 static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_ConsumerQOS (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_ConsumerQOS), (unsigned char *) &_oc_RtecEventChannelAdmin_ConsumerQOS, CORBA::B_FALSE);
 CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_ConsumerQOS = &_tc__tc_RtecEventChannelAdmin_ConsumerQOS;
 
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminC.h b/TAO/orbsvcs/lib/RtecEventChannelAdminC.h
index fe59fe09d9a..07567869f9c 100644
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminC.h
+++ b/TAO/orbsvcs/lib/RtecEventChannelAdminC.h
@@ -248,8 +248,6 @@ static CORBA::TypeCode_ptr _tc_TypeError;
   {
     ACE_NESTED_CLASS (RtecEventChannelAdmin,DependencySet) dependencies;
 
-    RtecEventComm::Event forward_event;
-
   };
 
   class ConsumerQOS_var
diff --git a/TAO/orbsvcs/lib/RtecSchedulerC.h b/TAO/orbsvcs/lib/RtecSchedulerC.h
index 99d452f32df..eec210cb6b1 100644
--- a/TAO/orbsvcs/lib/RtecSchedulerC.h
+++ b/TAO/orbsvcs/lib/RtecSchedulerC.h
@@ -262,8 +262,8 @@ public:
   public:
     RT_Info_out (RT_Info *&);
     RT_Info_out (RT_Info_var &);
-    RT_Info_out (RT_Info_out &);
-    RT_Info_out &operator= (RT_Info_out &);
+    RT_Info_out (const RT_Info_out &);
+    RT_Info_out &operator= (const RT_Info_out &);
     RT_Info_out &operator= (RT_Info *);
     operator RT_Info *&();
     RT_Info *&ptr (void);
@@ -506,8 +506,8 @@ static CORBA::TypeCode_ptr _tc_TASK_COUNT_MISMATCH;
   public:
     _tao__seq_RT_Info_Set_out (_tao__seq_RT_Info_Set *&);
     _tao__seq_RT_Info_Set_out (_tao__seq_RT_Info_Set_var &);
-    _tao__seq_RT_Info_Set_out (_tao__seq_RT_Info_Set_out &);
-    _tao__seq_RT_Info_Set_out &operator= (_tao__seq_RT_Info_Set_out &);
+    _tao__seq_RT_Info_Set_out (const _tao__seq_RT_Info_Set_out &);
+    _tao__seq_RT_Info_Set_out &operator= (const _tao__seq_RT_Info_Set_out &);
     _tao__seq_RT_Info_Set_out &operator= (_tao__seq_RT_Info_Set *);
     operator _tao__seq_RT_Info_Set *&();
     _tao__seq_RT_Info_Set *&ptr (void);
diff --git a/TAO/orbsvcs/lib/RtecSchedulerC.i b/TAO/orbsvcs/lib/RtecSchedulerC.i
index 9a688e26490..9da5fcca635 100644
--- a/TAO/orbsvcs/lib/RtecSchedulerC.i
+++ b/TAO/orbsvcs/lib/RtecSchedulerC.i
@@ -486,12 +486,12 @@ RtecScheduler::RT_Info_out::RT_Info_out (RtecScheduler::RT_Info_var &p) // const
 }
 
 ACE_INLINE
-RtecScheduler::RT_Info_out::RT_Info_out (RtecScheduler::RT_Info_out &p) // copy constructor
+RtecScheduler::RT_Info_out::RT_Info_out (const RtecScheduler::RT_Info_out &p) // copy constructor
 	: ptr_ (p.ptr_)
 {}
 
 ACE_INLINE RtecScheduler::RT_Info_out &
-RtecScheduler::RT_Info_out::operator= (RtecScheduler::RT_Info_out &p)
+RtecScheduler::RT_Info_out::operator= (const RtecScheduler::RT_Info_out &p)
 {
   this->ptr_ = p.ptr_;
   return *this;
@@ -791,12 +791,12 @@ RtecScheduler::_tao__seq_RT_Info_Set_out::_tao__seq_RT_Info_Set_out (RtecSchedul
 }
 
 ACE_INLINE
-RtecScheduler::_tao__seq_RT_Info_Set_out::_tao__seq_RT_Info_Set_out (RtecScheduler::_tao__seq_RT_Info_Set_out &p) // copy constructor
+RtecScheduler::_tao__seq_RT_Info_Set_out::_tao__seq_RT_Info_Set_out (const RtecScheduler::_tao__seq_RT_Info_Set_out &p) // copy constructor
 	: ptr_ (p.ptr_)
 {}
 
 ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set_out &
-RtecScheduler::_tao__seq_RT_Info_Set_out::operator= (RtecScheduler::_tao__seq_RT_Info_Set_out &p)
+RtecScheduler::_tao__seq_RT_Info_Set_out::operator= (const RtecScheduler::_tao__seq_RT_Info_Set_out &p)
 {
   this->ptr_ = p.ptr_;
   return *this;
diff --git a/TAO/tao/corbacom.i b/TAO/tao/corbacom.i
index 5c026b1d692..4a64e173eee 100644
--- a/TAO/tao/corbacom.i
+++ b/TAO/tao/corbacom.i
@@ -56,7 +56,7 @@ CORBA::String_var::~String_var (void)
 
 ACE_INLINE
 CORBA::String_var::String_var (char *p)
-  : ptr_ (p)
+  : ptr_ (CORBA::string_dup (p))
 {
   // argument is consumed. p should never be NULL
 }