--- orig/PollableC.h	Tue Apr 24 23:49:07 2001
+++ PollableC.h	Tue Apr 24 16:43:49 2001
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id$
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -19,17 +19,22 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_POLLABLEC_H_
-#define _TAO_IDL_POLLABLEC_H_
-
+#ifndef _TAO_IDL_TMP_POLLABLEC_H_
+#define _TAO_IDL_TMP_POLLABLEC_H_
 #include "ace/pre.h"
-#include "tao/corba.h"
+
+#include "tao/corbafwd.h"
+
+#if (TAO_HAS_AMI_POLLER == 1)
+
+#include "tao/Object.h"
+#include "tao/Exception.h"
+#include "tao/CDR.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/corbafwd.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -257,7 +262,7 @@
   virtual const char* _interface_repository_id (void) const;
 
 protected:
-  CORBA_Pollable ();
+  CORBA_Pollable (void);
   
   virtual ~CORBA_Pollable (void);
 private:
@@ -378,7 +383,7 @@
   virtual const char* _interface_repository_id (void) const;
 
 protected:
-  CORBA_DIIPollable ();
+  CORBA_DIIPollable (void);
   
   virtual ~CORBA_DIIPollable (void);
 private:
@@ -390,6 +395,15 @@
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_POLLABLESET___PTR_CH_)
+#define _CORBA_POLLABLESET___PTR_CH_
+
+class CORBA_PollableSet;
+typedef CORBA_PollableSet *CORBA_PollableSet_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_POLLABLESET_CH_)
 #define _CORBA_POLLABLESET_CH_
 
@@ -550,7 +564,7 @@
   virtual const char* _interface_repository_id (void) const;
 
 protected:
-  CORBA_PollableSet ();
+  CORBA_PollableSet (void);
   
   virtual ~CORBA_PollableSet (void);
 private:
@@ -579,6 +593,8 @@
 #if defined (__BORLANDC__)
 #pragma option pop
 #endif /* __BORLANDC__ */
+
+#endif /* TAO_HAS_AMI_POLLER == 1 */
 
 #include "ace/post.h"
 #endif /* ifndef */