--- orig/IFR_BasicS.h	Mon Apr 30 22:22:33 2001
+++ IFR_BasicS.h	Mon Apr 30 22:31:49 2001
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// IFR_BasicS.h.diff,v 1.3 2001/12/08 21:53:31 ossama Exp
+// IFR_BasicS.h.diff,v 1.3 2001/12/08 21:53:31 ossama Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -19,12 +19,12 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IFR_BASICS_H_
-#define _TAO_IDL_IFR_BASICS_H_
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_H_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_H_
 
 #include "ace/pre.h"
 #include "IFR_BaseS.h"
-#include "IFR_BasicC.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -47,11 +47,6 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-TAO_NAMESPACE  POA_CORBA
-{
-}
-TAO_NAMESPACE_CLOSE // module CORBA
-
 class POA_CORBA_Repository;
 typedef POA_CORBA_Repository *POA_CORBA_Repository_ptr;
 // Forward Classes Declaration
@@ -428,6 +423,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -435,6 +431,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -546,14 +544,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_ModuleDef;
 typedef POA_CORBA_ModuleDef *POA_CORBA_ModuleDef_ptr;
 // Forward Classes Declaration
@@ -879,6 +876,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -886,6 +884,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -923,14 +923,13 @@
   
   virtual ~_TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void) { }
   
-  
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_ConstantDef;
 typedef POA_CORBA_ConstantDef *POA_CORBA_ConstantDef_ptr;
 // Forward Classes Declaration
@@ -1202,6 +1201,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -1209,6 +1209,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -1287,14 +1289,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_StructDef;
 typedef POA_CORBA_StructDef *POA_CORBA_StructDef_ptr;
 // Forward Classes Declaration
@@ -1661,6 +1662,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -1668,6 +1670,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -1722,14 +1726,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_UnionDef;
 typedef POA_CORBA_UnionDef *POA_CORBA_UnionDef_ptr;
 // Forward Classes Declaration
@@ -2145,6 +2148,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -2152,6 +2156,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -2231,14 +2237,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_EnumDef;
 typedef POA_CORBA_EnumDef *POA_CORBA_EnumDef_ptr;
 // Forward Classes Declaration
@@ -2469,6 +2474,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -2476,6 +2482,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -2529,14 +2537,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_AliasDef;
 typedef POA_CORBA_AliasDef *POA_CORBA_AliasDef_ptr;
 // Forward Classes Declaration
@@ -2767,6 +2774,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -2774,6 +2782,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -2827,14 +2837,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_NativeDef;
 typedef POA_CORBA_NativeDef *POA_CORBA_NativeDef_ptr;
 // Forward Classes Declaration
@@ -3032,6 +3041,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -3039,6 +3049,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -3075,14 +3087,13 @@
   
   virtual ~_TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void) { }
   
-  
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_PrimitiveDef;
 typedef POA_CORBA_PrimitiveDef *POA_CORBA_PrimitiveDef_ptr;
 // Forward Classes Declaration
@@ -3208,6 +3219,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -3215,6 +3227,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -3259,14 +3273,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_StringDef;
 typedef POA_CORBA_StringDef *POA_CORBA_StringDef_ptr;
 // Forward Classes Declaration
@@ -3409,6 +3422,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -3416,6 +3430,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -3469,14 +3485,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_WstringDef;
 typedef POA_CORBA_WstringDef *POA_CORBA_WstringDef_ptr;
 // Forward Classes Declaration
@@ -3619,6 +3634,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -3626,6 +3642,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -3679,14 +3697,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_SequenceDef;
 typedef POA_CORBA_SequenceDef *POA_CORBA_SequenceDef_ptr;
 // Forward Classes Declaration
@@ -3878,6 +3895,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -3885,6 +3903,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -3963,14 +3983,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_ArrayDef;
 typedef POA_CORBA_ArrayDef *POA_CORBA_ArrayDef_ptr;
 // Forward Classes Declaration
@@ -4162,6 +4181,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -4169,6 +4189,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -4247,14 +4269,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_ExceptionDef;
 typedef POA_CORBA_ExceptionDef *POA_CORBA_ExceptionDef_ptr;
 // Forward Classes Declaration
@@ -4629,6 +4650,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -4636,6 +4658,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -4698,14 +4722,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_AttributeDef;
 typedef POA_CORBA_AttributeDef *POA_CORBA_AttributeDef_ptr;
 // Forward Classes Declaration
@@ -4977,6 +5000,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -4984,6 +5008,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -5062,14 +5088,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_OperationDef;
 typedef POA_CORBA_OperationDef *POA_CORBA_OperationDef_ptr;
 // Forward Classes Declaration
@@ -5440,6 +5465,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -5447,6 +5473,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -5576,14 +5604,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_InterfaceDef;
 typedef POA_CORBA_InterfaceDef *POA_CORBA_InterfaceDef_ptr;
 // Forward Classes Declaration
@@ -6028,6 +6055,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -6035,6 +6063,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -6136,14 +6166,13 @@
       CORBA::SystemException
     ));
 
-
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_AbstractInterfaceDef;
 typedef POA_CORBA_AbstractInterfaceDef *POA_CORBA_AbstractInterfaceDef_ptr;
 // Forward Classes Declaration
@@ -6525,6 +6554,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -6532,6 +6562,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -6568,14 +6600,13 @@
   
   virtual ~_TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) { }
   
-  
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
 class POA_CORBA_LocalInterfaceDef;
 typedef POA_CORBA_LocalInterfaceDef *POA_CORBA_LocalInterfaceDef_ptr;
 // Forward Classes Declaration
@@ -6957,6 +6988,7 @@
   );
 
 private:
+
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
@@ -6964,6 +6996,8 @@
     TAO_ENV_SINGLE_ARG_DECL
   );
   
+private:
+  
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
@@ -7000,13 +7034,12 @@
   
   virtual ~_TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) { }
   
-  
 };
 
+
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
-
 
 #include "IFR_BasicS_T.h"
 
