summaryrefslogtreecommitdiff
path: root/TAO/tao/MessagingS.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/MessagingS.h')
-rw-r--r--TAO/tao/MessagingS.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h
index b321a983cdd..fcc21b667a2 100644
--- a/TAO/tao/MessagingS.h
+++ b/TAO/tao/MessagingS.h
@@ -1602,8 +1602,7 @@ private:
#endif /* ACE_HAS_USING_KEYWORD */
-#if defined (TAO_HAS_AMI_CALLBACK)
-
+#if defined (TAO_POLLER)
class ReplyHandler;
typedef ReplyHandler *ReplyHandler_ptr;
class TAO_Export ReplyHandler : public virtual PortableServer::ServantBase
@@ -1717,10 +1716,6 @@ private:
#endif /* ACE_HAS_USING_KEYWORD */
-#endif /* TAO_HAS_AMI_CALLBACK */
-
-#if defined (TAO_HAS_AMI_POLLER)
-
class Poller;
typedef Poller *Poller_ptr;
class TAO_Export Poller : public virtual POA_CORBA::Pollable
@@ -2002,7 +1997,7 @@ private:
};
#endif /* ACE_HAS_USING_KEYWORD */
-#endif /* TAO_HAS_AMI_POLLER */
+#endif /* TAO_POLLER */
}
TAO_NAMESPACE_CLOSE