diff options
Diffstat (limited to 'TAO/tests/File_IO/File_i.cpp')
| -rw-r--r-- | TAO/tests/File_IO/File_i.cpp | 66 |
1 files changed, 22 insertions, 44 deletions
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index 2e74de2a9f9..3622604315c 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -27,10 +27,8 @@ FileImpl::System::System (PortableServer::POA_ptr poa) // Create the Default Descriptor Servant fd_servant_ (poa) { - ACE_DECLARE_NEW_CORBA_ENV; // set the default servant of the POA - poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + poa->set_servant (&this->fd_servant_); } FileImpl::System::~System (void) @@ -38,15 +36,14 @@ FileImpl::System::~System (void) } PortableServer::POA_ptr -FileImpl::System::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::System::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } File::Descriptor_ptr FileImpl::System::open (const char *file_name, - CORBA::Long flags - ACE_ENV_ARG_DECL) + CORBA::Long flags) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { @@ -75,15 +72,12 @@ FileImpl::System::open (const char *file_name, // from ACE_HANDLE string CORBA::Object_var obj = this->poa_->create_reference_with_id (oid.in (), - "IDL:File/Descriptor:1.0" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (File::Descriptor::_nil ()); + "IDL:File/Descriptor:1.0"); // Narrow the object reference to a File Descriptor File::Descriptor_var fd = - File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + File::Descriptor::_narrow (obj.in ()); - ACE_CHECK_RETURN (File::Descriptor::_nil ()); return fd._retn (); } @@ -99,59 +93,50 @@ FileImpl::Descriptor::~Descriptor (void) } PortableServer::POA_ptr -FileImpl::Descriptor::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::Descriptor::_default_POA (void) { return PortableServer::POA::_duplicate (this->poa_.in ()); } //Extracts the ACE_HANDLE from the passed object reference ACE_HANDLE -FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::fd (void) { // // One way of getting our id. // // Get a reference to myself - File::Descriptor_var me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); + File::Descriptor_var me = this->_this (); // Get the ObjectId from the reference PortableServer::ObjectId_var oid1 = - this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); + this->poa_->reference_to_id (me.in ()); // // Another way of getting our id. // PortableServer::ObjectId_var oid2 = - this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); + this->poa_->servant_to_id (this); // // Yet another way of getting our id. // int argc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); + CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0); // Get the POA Current object reference CORBA::Object_var obj = - orb->resolve_initial_references ("POACurrent" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); + orb->resolve_initial_references ("POACurrent"); // Narrow the object reference to a POA Current reference PortableServer::Current_var poa_current = - PortableServer::Current::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); + PortableServer::Current::_narrow (obj.in ()); PortableServer::ObjectId_var oid3 = - poa_current->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (ACE_INVALID_HANDLE); + poa_current->get_object_id (); ACE_ASSERT (oid1.in () == oid2.in ()); ACE_ASSERT (oid2.in () == oid3.in ()); @@ -165,13 +150,11 @@ FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Long -FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer - ACE_ENV_ARG_DECL) +FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ACE_HANDLE file_descriptor = this->fd (); const CORBA::Octet *data = &buffer[0]; @@ -185,13 +168,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer } File::Descriptor::DataBuffer * -FileImpl::Descriptor::read (CORBA::Long num_bytes - ACE_ENV_ARG_DECL) +FileImpl::Descriptor::read (CORBA::Long num_bytes) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ACE_HANDLE file_descriptor = this->fd (); CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes); ssize_t length = ACE_OS::read (file_descriptor, buffer, num_bytes); @@ -208,13 +189,11 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes CORBA::ULong FileImpl::Descriptor::lseek (CORBA::ULong offset, - CORBA::Long whence - ACE_ENV_ARG_DECL) + CORBA::Long whence) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ACE_HANDLE file_descriptor = this->fd (); CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor, offset, @@ -226,12 +205,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset, } void -FileImpl::Descriptor::destroy (ACE_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ACE_HANDLE for this object reference - ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_HANDLE file_descriptor = this->fd (); // Close the file corresponding to this object reference. ACE_OS::close (file_descriptor); |