diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-16 14:53:24 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-16 14:53:24 +0000 |
| commit | 42fac0d287bd13953aee0100d09f270bd7fa9f12 (patch) | |
| tree | aa5b7bc1ceec0861a66b0bc68f58c324344c3b1c | |
| parent | bf7809ac4424ab045db078b6756e416dbfacd21a (diff) | |
| download | ATCD-42fac0d287bd13953aee0100d09f270bd7fa9f12.tar.gz | |
Tue Apr 16 14:51:42 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/Messaging/AMH_Response_Handler.cpp | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 34f52136d33..fd89ec2b04c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 16 14:51:42 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/Messaging/AMH_Response_Handler.cpp: + + Fix to the previous fix. I was too cavalier in copying the CORBA + subset macro tests from the ForwardRequest.pidl file. + Tue Apr 16 14:25:30 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * tao/IORTable/IOR_Table_Impl.h: @@ -7,7 +14,7 @@ Tue Apr 16 14:25:30 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * tao/Messaging/AMH_Response_Handler.cpp: - Ensure the library can be built even on corba subset builds. + Ensure the library can be built even on CORBA subset builds. Mon Apr 15 19:49:48 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index 2e9f2672ffe..2dd102a5c73 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -196,8 +196,8 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (const CORBA::Exception &ex) // this: the caller already knows this because it is part of the // ExceptionHolder information. -#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA) - const PortableServer::ForwardReuest *fr = +#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) && (TAO_HAS_MINIMUM_POA == 0) + const PortableServer::ForwardRequest *fr = PortableServer::ForwardRequest::_downcast (&ex); if (fr != 0) { |