diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-02-05 09:46:50 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-02-05 09:46:50 +0000 |
| commit | c5390c3944086f83c5f973a2d6da3514c74aedba (patch) | |
| tree | 3de4ec6d42cbeea3b76c713dc5afaeb810eccb4e | |
| parent | 3b67afae2c4b2e72816a660efdcf2adfe2ebcc76 (diff) | |
| download | ATCD-c5390c3944086f83c5f973a2d6da3514c74aedba.tar.gz | |
ChangeLogTag: Wed Feb 05 09:43:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/ORT/Gateway_i.cpp | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_mingw32.GNU | 2 |
5 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index e480923d354..256dd77f332 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 5 09:45:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_mingw32.GNU: + Removed desciption to MINGW_BASE. + Tue Feb 4 13:13:08 2003 Krishnakumar B <kitty@cs.wustl.edu> * include/makeinclude/rules.lib.GNU: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index e480923d354..256dd77f332 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Wed Feb 5 09:45:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_mingw32.GNU: + Removed desciption to MINGW_BASE. + Tue Feb 4 13:13:08 2003 Krishnakumar B <kitty@cs.wustl.edu> * include/makeinclude/rules.lib.GNU: diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6ca43912854..21cf577e5e2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 5 09:44:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/examples/ORT/Gateway_i.cpp: + Renamed local variable interface to target_interface to resolve + clash with MingW interface macro. + Wed Feb 5 08:51:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/PSS/PSDL_Node_Visitor.cpp: diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp index 3a9009d9d99..98072b66f62 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp @@ -42,11 +42,11 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request ACE_CHECK; // Use the IfR interfaces to query the NVList for this object... - CORBA::InterfaceDef_var interface = + CORBA::InterfaceDef_var target_interface = target_object->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if (CORBA::is_nil (interface.in ())) + if (CORBA::is_nil (target_interface.in ())) { /// } @@ -56,7 +56,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request request->operation (); CORBA::Contained_var contained_operation = - interface->lookup (operation_name.in ()); + target_interface->lookup (operation_name.in ()); CORBA::OperationDef_var operation = CORBA::OperationDef::_narrow (contained_operation.in ()); diff --git a/include/makeinclude/platform_mingw32.GNU b/include/makeinclude/platform_mingw32.GNU index 66dd974e3cb..0d6850458c6 100644 --- a/include/makeinclude/platform_mingw32.GNU +++ b/include/makeinclude/platform_mingw32.GNU @@ -1,7 +1,7 @@ # $Id$ # This file should allow to build ACE for mingw32 with mingw tools. -# Edit to change TCPU and MINGW_BASE below. +# Edit to change TCPU below. # # Don't forget to define the ACE_ROOT environment variable! |