--- orig/DomainS_T.h	Mon Apr 30 22:11:10 2001
+++ DomainS_T.h	Mon Apr 30 22:02:30 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,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_DOMAINS_T_H_
-#define _TAO_IDL_DOMAINS_T_H_
+#ifndef _TAO_IDL_ORIG_DOMAINS_T_H_
+#define _TAO_IDL_ORIG_DOMAINS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
@@ -32,11 +32,6 @@
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
-TAO_NAMESPACE  POA_CORBA
-{
-}
-TAO_NAMESPACE_CLOSE // module CORBA
-
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
 class TAO_Domain_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager
@@ -70,7 +65,7 @@
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA_Policy_ptr get_domain_policy (
+  CORBA::Policy_ptr get_domain_policy (
       CORBA::PolicyType policy_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -89,6 +84,7 @@
   void operator= (const POA_CORBA_DomainManager_tie &);
 };
 
+
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
 class TAO_Domain_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy
@@ -123,7 +119,7 @@
         TAO_default_environment ()
     );
   void make_domain_manager (
-      CORBA_InterfaceDef_ptr object_type,
+      CORBA::InterfaceDef_ptr object_type,
       CORBA::Boolean constr_policy,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -140,7 +136,7 @@
       CORBA::SystemException
     ));
 
-  CORBA_Policy_ptr copy (
+  CORBA::Policy_ptr copy (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )