summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-06-19 19:50:42 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-06-19 19:50:42 +0000
commitf196180de63dd0737884d224ce0e108ce693b77d (patch)
tree2c1ab4397729ee14263a19d966caaa736d04d0e5 /TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
parentf3748c78b57c2e4d646113c689c154a0726ca37b (diff)
downloadATCD-f196180de63dd0737884d224ce0e108ce693b77d.tar.gz
ChangeLogTag: Mon Jun 19 12:11:09 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp')
-rw-r--r--TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index 9b2d483f011..d7ce947dbae 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -52,7 +52,7 @@ ACE_THROW_SPEC ((CORBA::Exception))
ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
-#if (TAO_HAS_MINIMUM_CORBA == 0)
+#if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
ACE_CATCH (PortableServer::ForwardRequest, forward_request)
{
forward_obj =
@@ -65,7 +65,7 @@ ACE_THROW_SPEC ((CORBA::Exception))
ACE_UNUSED_ARG (forward_obj);
ACE_RE_THROW;
}
-#endif /* TAO_HAS_MINIMUM_CORBA */
+#endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/
ACE_ENDTRY;
ACE_CHECK;
}