summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-03 01:56:40 +0000
committercrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-02-03 01:56:40 +0000
commit713d157e4f5ae70e97ebb8083369151ac76cf59b (patch)
treec6db6e9609c2acca4c7d7afdd4858d2c4ed710ad
parent734720f262405c55e2b1bb915a9e8f69636ba0c3 (diff)
downloadATCD-713d157e4f5ae70e97ebb8083369151ac76cf59b.tar.gz
ChangeLogTag: Sat Feb 2 20:45:08 2002 Craig Rodrigues <crodrigu@bbn.com>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a9
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp10
2 files changed, 9 insertions, 10 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 332963953e7..73759c00e3a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Sat Feb 2 20:45:08 2002 Craig Rodrigues <crodrigu@bbn.com>
+
+ * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: Do not use ACE_CHECK or
+ ACE_CHECK_RETURN macros if ACE_ENV_ARG_DECL_NOT_USED macro
+ is defined, otherwise it messes up build which define exceptions=0.
+
Sat Feb 2 12:36:31 2002 Ossama Othman <ossama@uci.edu>
* tao/ORB_Core.cpp (init):
@@ -21,6 +27,9 @@ Fri Feb 1 23:25:39 2002 Venkita Subramonian <venkita@cs.wustl.edu>
Fri Feb 1 22:00:00 2002 Rob Ruff <rruff@scires.com>
Craig Rodrigues <crodrigu@bbn.com>
+ * orbsvcs/orbsvcs/AV/RTP.h (TAO_AV_RTP_Object::connection_gone_):
+ Added.
+
* orbsvcs/orbsvcs/AV/RTP.cpp (TAO_AV_RTP_Object::handle_input):
Check errno to see if remote peer has disappeared.
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 86dc010dac2..3c761f902bc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -3377,7 +3377,6 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
ACE_UNUSED_ARG (the_qos);
ACE_UNUSED_ARG (is_met);
ACE_UNUSED_ARG (the_spec);
- ACE_CHECK_RETURN (0);
return 0;
}
@@ -3760,7 +3759,6 @@ TAO_MMDevice::get_fdev (const char *flow_name
AVStreams::notSupported,
AVStreams::noSuchFlow))
{
- ACE_CHECK_RETURN (0);
ACE_CString fdev_name_key (flow_name);
FDev_Map::ENTRY *fdev_entry = 0;
@@ -3969,7 +3967,6 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
AVStreams::QoSRequestFailed))
{
ACE_UNUSED_ARG (new_qos);
- ACE_CHECK_RETURN (0);
return 0;
}
@@ -4148,7 +4145,6 @@ CORBA::Boolean
TAO_FlowConnection::disconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_CHECK_RETURN (0);
return 0;
}
@@ -4362,7 +4358,6 @@ TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target
AVStreams::notConnected))
{
ACE_UNUSED_ARG (target);
- ACE_CHECK_RETURN (0);
return 0;
}
@@ -4450,7 +4445,6 @@ TAO_FlowEndPoint::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// lock the current flowendpoint
- ACE_CHECK_RETURN (0);
if (this->lock_)
return 0;
@@ -4463,8 +4457,6 @@ void
TAO_FlowEndPoint::unlock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_CHECK;
-
this->lock_ = 0;
}
@@ -4510,8 +4502,6 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- ACE_CHECK;
-
this->related_flow_connection_ = AVStreams::FlowConnection::_duplicate (related_flow_connection);
}