diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-28 17:58:17 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-28 17:58:17 +0000 |
| commit | c41a1e1f4f37530e7b186a5844199c112184cd24 (patch) | |
| tree | 76c45e0e13ca761fc02318598479a9404cb87e15 | |
| parent | 5895d2d8efd116256dc3cb80b00167aae1bf8d17 (diff) | |
| download | ATCD-c41a1e1f4f37530e7b186a5844199c112184cd24.tar.gz | |
Mon Apr 28 17:57:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 964a91ae298..6619b32fdff 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Apr 28 17:57:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/examples/Notify/MC/monitor/monitor.mpc: + Made project name more unique + + * orbsvcs/orbsvcs/AV/Flows_T.cpp: + Initialise pointer with 0 + Mon Apr 28 14:24:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h diff --git a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc index 31c4e5979ee..d32506ad621 100644 --- a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc +++ b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.mpc @@ -1,4 +1,4 @@ // $Id$ -project: notification_mc { +project (mc_monitor_example): notification_mc { exename = monitor } diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index d7474e32a34..2de1e19c506 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -360,7 +360,6 @@ TAO_FlowSpec_Entry::parse_address (const char *address, if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ) { - ACE_DEBUG ((LM_DEBUG, "Number of local sec addresses = %d\n", port_tokenizer.num_tokens () - 1)); diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp index 2537084feb1..9573932f203 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp @@ -92,7 +92,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr / try { // Activate the producer implementation under the Root POA. - T_Producer *producer_i; + T_Producer *producer_i = 0; ACE_NEW_RETURN (producer_i, T_Producer, 0); this->producer_list_.insert_tail (producer_i); producer = producer_i->_this (); |