diff options
| author | frehberger <frehberger@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-29 16:32:14 +0000 |
|---|---|---|
| committer | frehberger <frehberger@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-29 16:32:14 +0000 |
| commit | 5bff8eaddc14bcae9af7a905844d31847718d017 (patch) | |
| tree | 7111d39db496d76db58e57adf30cfda0a62e3dc8 /TAO | |
| parent | 6b7b945b68516e0be6e19f4c7f687e4c7186509c (diff) | |
| download | ATCD-5bff8eaddc14bcae9af7a905844d31847718d017.tar.gz | |
ChangeLogTag: Wed Mar 29 17:15:00 UTC 2006 Frank Rehberger <frehberger@prismtech.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/Invocation_Adapter.cpp | 13 | ||||
| -rw-r--r-- | TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp | 4 |
4 files changed, 26 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ebe8ee20480..cf746ab4a26 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 29 17:15:00 UTC 2006 Frank Rehberger <frehberger@prismtech.com> + * TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp: + TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp: + TAO/tao/Invocation_Adapter.cpp: + Guard expression with if-else-endif macro for MINIMUM builds. + Wed Mar 29 15:38:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h: diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index 2da26c76a3a..1cf3a172f6a 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -85,9 +85,12 @@ namespace TAO effective_target = synch.steal_forwarded_reference (); +#if TAO_HAS_INTERCEPTORS == 1 const CORBA::Boolean permanent_forward = (synch.reply_status() == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM); - +#else + const CORBA::Boolean permanent_forward = false; +#endif this->object_forwarded (effective_target, r.stub (), permanent_forward diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 26cf176af9e..612b6bbbb18 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -191,8 +191,12 @@ namespace TAO effective_target = coll_inv.steal_forwarded_reference (); +#if TAO_HAS_INTERCEPTORS == 1 const bool is_permanent_forward = (coll_inv.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM); +#else + const bool is_permanent_forward = false; +#endif (void) this->object_forwarded (effective_target, stub, @@ -326,8 +330,12 @@ namespace TAO effective_target = synch.steal_forwarded_reference (); +#if TAO_HAS_INTERCEPTORS == 1 const bool is_permanent_forward = (synch.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM); +#else + const bool is_permanent_forward = false; +#endif this->object_forwarded (effective_target, r.stub (), @@ -361,9 +369,12 @@ namespace TAO effective_target = synch.steal_forwarded_reference (); +#if TAO_HAS_INTERCEPTORS == 1 const bool is_permanent_forward = (synch.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM); - +#else + const bool is_permanent_forward = false; +#endif this->object_forwarded (effective_target, r.stub (), is_permanent_forward diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index 2f1bb0818e1..b88ff2855ae 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -175,8 +175,12 @@ namespace TAO { effective_target = asynch.steal_forwarded_reference (); +#if TAO_HAS_INTERCEPTORS == 1 const CORBA::Boolean permanent_forward = (asynch.reply_status() == TAO_GIOP_LOCATION_FORWARD_PERM); +#else + const CORBA::Boolean permanent_forward = false; +#endif this->object_forwarded (effective_target, r.stub (), |