diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-09-13 11:17:49 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-09-13 11:17:49 +0000 |
| commit | d885c8c1609f5fe856c5e5ea99d2818fb0352637 (patch) | |
| tree | 5804f99cfebd80f0976bc4ff4265361d64824b33 | |
| parent | 27070b21a4369a92741b10789533ac16dae0d4bd (diff) | |
| download | ATCD-d885c8c1609f5fe856c5e5ea99d2818fb0352637.tar.gz | |
ChangeLogTag:Mon Sep 13 06:16:31 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Container_Base.cpp | 12 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Container_Base.cpp | 12 |
3 files changed, 20 insertions, 12 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 88c2347457b..c73a55285ad 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Sep 13 06:16:31 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * DAnCE/ciao/Container_Base.cpp: + * ciao/Container_Base.cpp: + + Fixed wrong ACE_CHECK usage. This should fix compilation errors + in Full_Reactors build. + Mon Sep 13 04:20:44 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * DAnCE/ciao/CCM_Core.mpc: diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp index 2d948f08df7..f1fce5ec95f 100644 --- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp +++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp @@ -74,7 +74,7 @@ namespace CIAO CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -84,24 +84,24 @@ namespace CIAO PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); this->create_component_POA (name, more_policies, root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); this->create_facet_consumer_POA (root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); return 0; } diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp index 6936e1ed59f..8a0d48b8810 100644 --- a/TAO/CIAO/ciao/Container_Base.cpp +++ b/TAO/CIAO/ciao/Container_Base.cpp @@ -74,7 +74,7 @@ namespace CIAO CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -84,24 +84,24 @@ namespace CIAO PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); this->create_component_POA (name, more_policies, root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); this->create_facet_consumer_POA (root_poa.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); return 0; } |