diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-03-25 17:47:21 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-03-25 17:47:21 +0000 |
| commit | e75a6a5cf1d9e39d141a156355c506919d3ffbe9 (patch) | |
| tree | dbbb025f4bc0781066df65d1d8531cfbd989fb59 /TAO | |
| parent | b1f376ce133f74d6beae1a6f8a5a80ba8a2e04f0 (diff) | |
| download | ATCD-e75a6a5cf1d9e39d141a156355c506919d3ffbe9.tar.gz | |
ChangeLogTag: Tue Mar 25 17:50:23 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8e121b177f5..7525bb28ddb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Mar 25 17:50:23 UTC 2008 Chad Elliott <elliott_c@ociweb.com> + + * orbsvcs/examples/Notify/MC/monitor/monitor.cpp: + * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp: + + Use .in() to avoid warnings from gcc. + Tue Mar 25 14:13:15 UTC 2008 Adam Mitz <mitza@ociweb.com> * MPC/config/notify_serv.mpb: diff --git a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp index 08328c53f7c..2a73fb3fca2 100644 --- a/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp +++ b/TAO/orbsvcs/examples/Notify/MC/monitor/monitor.cpp @@ -204,15 +204,15 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) } else { - if (process_command (nsm, rl, shutdown_cmd)) + if (process_command (nsm.in (), rl, shutdown_cmd)) continue; - else if (process_command (nsm, rl, rm_consumer)) + else if (process_command (nsm.in (), rl, rm_consumer)) continue; - else if (process_command (nsm, rl, rm_supplier)) + else if (process_command (nsm.in (), rl, rm_supplier)) continue; - else if (process_command (nsm, rl, rm_consumeradmin)) + else if (process_command (nsm.in (), rl, rm_consumeradmin)) continue; - else if (process_command (nsm, rl, rm_supplieradmin)) + else if (process_command (nsm.in (), rl, rm_supplieradmin)) continue; try diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp index c242879d0b6..64e7370120c 100644 --- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp +++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp @@ -51,7 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) monitor_ec_factory->create_named_channel (qos_prop, admin_prop, id, ec_name.c_str ()); NotifyMonitoringExt::EventChannel_var mec = - NotifyMonitoringExt::EventChannel::_narrow (ec); + NotifyMonitoringExt::EventChannel::_narrow (ec.in ()); if (CORBA::is_nil (mec.in ())) error ("Unable to narrow the event channel"); |