diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 0da9f75664f..55708a8dc13 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -1,7 +1,8 @@ -// -*- C++ -*- // $Id$ -#include "TAO_TIO.h" +#include "orbsvcs/Time/TAO_TIO.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. TAO_TIO::TAO_TIO (TimeBase::TimeT lower, @@ -69,7 +70,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, ACE_NEW_RETURN (tio, TAO_TIO (lb1, up1), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTOverlap; } @@ -80,6 +82,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, CosTime::OTNoOverlap); overlap = tio->_this (); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTContained; } @@ -89,7 +92,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (lb2, up2), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTContained; } @@ -101,7 +105,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (0, 0), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTNoOverlap; } @@ -110,7 +115,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, ACE_NEW_RETURN (tio, TAO_TIO (lb2, up1), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTOverlap; } @@ -122,7 +128,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (0, 0), CosTime::OTNoOverlap); - overlap = tio->_this (); + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTNoOverlap; } @@ -132,8 +139,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, TAO_TIO (lb1, up2), CosTime::OTNoOverlap); - overlap = tio->_this (); - + overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); } } ACE_CATCHANY @@ -180,7 +187,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTOverlap; } @@ -191,7 +199,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTContained; } @@ -202,7 +211,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTContained; } @@ -214,7 +224,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, TAO_TIO (0, 0), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTNoOverlap; } @@ -225,7 +236,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTOverlap; } @@ -237,7 +249,8 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (CosTime::OTNoOverlap); - overlap = tio_i->_this (); + overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CosTime::OTNoOverlap); return CosTime::OTNoOverlap; } @@ -269,5 +282,7 @@ TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (CosTime::UTO::_nil ()); - return uto->_this (); + return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } + +TAO_END_VERSIONED_NAMESPACE_DECL |