diff options
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h | 2 | ||||
| -rw-r--r-- | TAO/tao/IFR_Client_Adapter.h | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9016c1478e9..5e50d735932 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Nov 18 11:29:30 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/IFR_Client_Adapter.h: + * tao/ORB.cpp: + * tao/IFR_Client/IFR_Client_Adapter_Impl.h: + + Fixed compile errors that were caused due to improper macro + usage. + Tue Nov 18 13:59:11 2003 Simon McQueen <sm@prismtechnologies.com> * tao/ORB.cpp (resolve_service): diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h index 9265afab785..66209abb0b7 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h @@ -70,7 +70,7 @@ public: CORBA::ORB_ptr orb, CORBA::OperationDef_ptr, CORBA::NVList_ptr& - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ); // Used to force the initialization of the ORB code. diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h index ed827bc7493..c7652ce4daf 100644 --- a/TAO/tao/IFR_Client_Adapter.h +++ b/TAO/tao/IFR_Client_Adapter.h @@ -93,7 +93,7 @@ public: CORBA::ORB_ptr orb, CORBA::OperationDef_ptr, CORBA::NVList_ptr& - ACE_ENV_ARG_DECL_WITH_DEFAULTS + ACE_ENV_ARG_DECL ) = 0; }; diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index e138ca7e274..e30ffbacd17 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1015,7 +1015,7 @@ CORBA::ORB::resolve_policy_current (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) CORBA::Object_ptr CORBA::ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id - ACE_ENV_ARG_DECL) + ACE_ENV_ARG_DECL_NOT_USED) { const char * env_service_port [] = { @@ -1176,7 +1176,7 @@ CORBA::ORB::resolve_initial_references (const char *name, { result = this->string_to_object( service_ior.c_str() ACE_ENV_ARG_PARAMETER ) ; - ACE_CHECK_RETURN( CORBA_Object::_nil() ) ; + ACE_CHECK_RETURN( CORBA::Object::_nil() ) ; return result._retn() ; } |