summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-08-17 11:38:38 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-08-17 11:38:38 +0000
commitbd4fed0e4752b98a6618bee3afaff19f4ccb4b4e (patch)
tree36e8eaf38035df148b4e103234f6479839db1efb
parent6a0da2fe5c6cad9cfe3601fe7866968800ece499 (diff)
downloadATCD-bd4fed0e4752b98a6618bee3afaff19f4ccb4b4e.tar.gz
ChangeLogTag: Wed Aug 17 08:34:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/tao/PI_Server/ServerInterceptorAdapter.cpp2
-rw-r--r--TAO/tao/PortableServer/PortableServer.h8
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index a18e3e8e636..6355bda6942 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -529,7 +529,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::execute_command (
// The actual upcall.
command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
- TAO_INTERCEPTOR_CHECK;
+ ACE_CHECK;
}
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
index a02ed5baa1a..22bbb1dece3 100644
--- a/TAO/tao/PortableServer/PortableServer.h
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -37,6 +37,14 @@ TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
#include "POAManagerC.h"
#include "PortableServer_Functions.h"
#include "PortableServer_WFunctions.h"
+#include "PS_ForwardA.h"
+#include "IdAssignmentPolicyA.h"
+#include "IdUniquenessPolicyA.h"
+#include "ImplicitActivationPolicyA.h"
+#include "LifespanPolicyA.h"
+#include "RequestProcessingPolicyA.h"
+#include "ServantRetentionPolicyA.h"
+#include "ThreadPolicyA.h"
#include /**/ "ace/post.h"