ChangeLogTag: Thu Mar 31 09:53:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

48 files changed, 158 insertions, 234 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index f7f98362acf..367b07c48ef 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -745,7 +745,7 @@ be_visitor_typecode_defn::visit_interface_fwd (be_interface_fwd * node)
         }
 
       os << "extern ::CORBA::TypeCode_ptr const _tc_"
-         << node->local_name ();
+         << node->local_name () << ";";
 
       if (this->gen_nested_namespace_end (module) == -1)
         {
diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp
index e4e4ca12e98..336f3bb483a 100644
--- a/TAO/tao/PortableServer/AdapterActivatorA.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp
@@ -46,7 +46,7 @@ static TAO::TypeCode::Objref<char const *,
   _tao_tc_PortableServer_AdapterActivator (
     "IDL:omg.org/PortableServer/AdapterActivator:2.3",
     "AdapterActivator");
-
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_AdapterActivator =
@@ -138,6 +138,6 @@ operator>>= (
         PortableServer::AdapterActivator \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp
index b7458c034a1..a99f4c667ed 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "AdapterActivatorC.h"
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h
index d8d84922a9b..df67328de2c 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.h
+++ b/TAO/tao/PortableServer/AdapterActivatorC.h
@@ -54,13 +54,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -234,7 +227,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "AdapterActivatorC.inl"
diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp
index 12401bfa929..c2ad960aa21 100644
--- a/TAO/tao/PortableServer/ForwardRequestA.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestA.cpp
@@ -42,7 +42,6 @@ static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServe
     { "forward_reference", &CORBA::_tc_Object }
     
   };
-
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp
index bb606a8a0c1..512d1d08395 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "ForwardRequestC.h"
diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h
index e73732b3777..6d41833d7ca 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.h
+++ b/TAO/tao/PortableServer/ForwardRequestC.h
@@ -50,13 +50,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -160,7 +153,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Port
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
index a6c35eb2b4f..62488772893 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
@@ -38,7 +38,7 @@
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_IdAssignmentPolicyValue[] =
   {
@@ -65,7 +65,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:73
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
@@ -83,7 +83,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -111,7 +111,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
index e7d06ad62a1..0a3c03514d2 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "IdAssignmentPolicyC.h"
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
index 4faa121f3ec..782665a53aa 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
@@ -54,13 +54,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -276,7 +269,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableSe
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "IdAssignmentPolicyC.inl"
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
index da8691332d3..2388981f35b 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
@@ -38,7 +38,7 @@
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_IdUniquenessPolicyValue[] =
   {
@@ -65,7 +65,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:73
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
@@ -83,7 +83,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -111,7 +111,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
index d6011f08212..2d27c2c08a4 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "IdUniquenessPolicyC.h"
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
index ceb48c91d6c..5d21c94edee 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
@@ -54,13 +54,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -276,7 +269,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableSe
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "IdUniquenessPolicyC.inl"
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
index f1aa8bd28f0..b75b6bb80dc 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
@@ -37,8 +37,10 @@
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_ImplicitActivationPolicyValue[] =
   {
@@ -65,7 +67,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:73
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
@@ -83,7 +85,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -111,7 +113,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -204,3 +206,5 @@ operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
index ccbb9b76ac4..2baf292bc3f 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "ImplicitActivationPolicyC.h"
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
index 81e90bf46f9..b6dde1450b8 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
@@ -54,13 +54,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -281,7 +274,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "ImplicitActivationPolicyC.inl"
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp
index bec5c9bb6e7..84c7cbd24c8 100644
--- a/TAO/tao/PortableServer/LifespanPolicyA.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp
@@ -38,7 +38,7 @@
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_LifespanPolicyValue[] =
   {
@@ -65,7 +65,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:73
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
@@ -83,7 +83,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -111,7 +111,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp
index 77158def0d6..6e0d9b7ffd8 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "LifespanPolicyC.h"
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h
index 44d81cd54de..d8ec8fc81ae 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.h
+++ b/TAO/tao/PortableServer/LifespanPolicyC.h
@@ -54,13 +54,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -276,7 +269,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableSe
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "LifespanPolicyC.inl"
diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp
index 09c401a70d0..1c7f8fee1ff 100644
--- a/TAO/tao/PortableServer/POAManagerA.cpp
+++ b/TAO/tao/PortableServer/POAManagerA.cpp
@@ -40,9 +40,9 @@
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POAManager_AdapterInactive = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POAManager_AdapterInactive = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -52,12 +52,12 @@ static TAO::TypeCode::Struct<char const *,
     "AdapterInactive",
     _tao_fields_PortableServer_POAManager_AdapterInactive,
     0);
-
+  
 ::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
   &_tao_tc_PortableServer_POAManager_AdapterInactive;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_POAManager_State[] =
   {
@@ -65,7 +65,7 @@ static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableSe
     { "ACTIVE" },
     { "DISCARDING" },
     { "INACTIVE" }
-
+    
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -76,12 +76,12 @@ static TAO::TypeCode::Enum<char const *,
     "State",
     _tao_enumerators_PortableServer_POAManager_State,
     4);
-
+  
 ::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
   &_tao_tc_PortableServer_POAManager_State;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:73
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
@@ -89,7 +89,7 @@ static TAO::TypeCode::Objref<char const *,
   _tao_tc_PortableServer_POAManager (
     "IDL:omg.org/PortableServer/POAManager:2.3",
     "POAManager");
-
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POAManager =
@@ -99,7 +99,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -167,8 +167,8 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -240,7 +240,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 
 
@@ -277,7 +277,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::extract (
         _tao_any,
         PortableServer::POAManager::_tc_State,
-        _tao_elem
+        _tao_elem 
       );
 }
 
@@ -315,4 +315,4 @@ CORBA::Boolean operator>>= (
         PortableServer::POAManager \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp
index 8f8540e003c..837db42286b 100644
--- a/TAO/tao/PortableServer/POAManagerC.cpp
+++ b/TAO/tao/PortableServer/POAManagerC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "POAManagerC.h"
@@ -34,7 +34,7 @@
 #include "tao/Null_RefCount_Policy.h"
 #include "tao/TypeCode_Constants.h"
 #include "tao/Alias_TypeCode.h"
-#include "tao/TypeCode_Non_Default_Case.h"
+#include "tao/TypeCode_Enumerator.h"
 #include "tao/Enum_TypeCode.h"
 #include "tao/Objref_TypeCode.h"
 #include "tao/Struct_TypeCode.h"
diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h
index 08871400c04..fdd547a9778 100644
--- a/TAO/tao/PortableServer/POAManagerC.h
+++ b/TAO/tao/PortableServer/POAManagerC.h
@@ -52,13 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -360,7 +353,7 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAMan
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::State &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "POAManagerC.inl"
diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp
index 3b5cf49e889..32bcc39eabe 100644
--- a/TAO/tao/PortableServer/PS_CurrentA.cpp
+++ b/TAO/tao/PortableServer/PS_CurrentA.cpp
@@ -39,7 +39,7 @@
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_Current_NoContext = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_Current_NoContext = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp
index 417b4a65818..5bc142c8630 100644
--- a/TAO/tao/PortableServer/PS_CurrentC.cpp
+++ b/TAO/tao/PortableServer/PS_CurrentC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "PS_CurrentC.h"
diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h
index 8ff3bba4e12..24b0c3bb92d 100644
--- a/TAO/tao/PortableServer/PS_CurrentC.h
+++ b/TAO/tao/PortableServer/PS_CurrentC.h
@@ -55,13 +55,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -310,7 +303,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "PS_CurrentC.inl"
diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp
index 97b69852ec1..63620ba434f 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardA.cpp
@@ -33,7 +33,7 @@
 #include "tao/Any.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
 static TAO::TypeCode::Alias<char const *,
                             TAO::Null_RefCount_Policy>
diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp
index d65eb0a655c..14eca5ec9fb 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "PS_ForwardC.h"
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index 3f2df5fdd7d..ab277b8e723 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -52,13 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -137,7 +130,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "PS_ForwardC.inl"
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index b48f8ee79e6..66678ecf716 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -39,12 +39,17 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
+// be\be_visitor_typecode/alias_typecode.cpp:31
 
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be\be_visitor_typecode/typecode_defn.cpp:808
+
+namespace PortableServer
+{
+  extern ::CORBA::TypeCode_ptr const _tc_POA;
+}
 
 namespace TAO
 {
@@ -78,9 +83,9 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POA_AdapterAlreadyExists = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_AdapterAlreadyExists = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -95,9 +100,9 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableServer_POA_AdapterAlreadyExists;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POA_AdapterNonExistent = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_AdapterNonExistent = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -112,9 +117,9 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableServer_POA_AdapterNonExistent;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_PortableServer_POA_InvalidPolicy[] =
+static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_PortableServer_POA_InvalidPolicy[] =
   {
     { "index", &CORBA::_tc_ushort }
 
@@ -133,9 +138,11 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableServer_POA_InvalidPolicy;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POA_NoServant = 0;
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_NoServant = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -149,10 +156,12 @@ static TAO::TypeCode::Struct<char const *,
 ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant =
   &_tao_tc_PortableServer_POA_NoServant;
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POA_ObjectAlreadyActive = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_ObjectAlreadyActive = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -167,9 +176,9 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableServer_POA_ObjectAlreadyActive;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POA_ObjectNotActive = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_ObjectNotActive = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -184,9 +193,9 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableServer_POA_ObjectNotActive;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POA_ServantAlreadyActive = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_ServantAlreadyActive = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -201,9 +210,9 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableServer_POA_ServantAlreadyActive;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POA_ServantNotActive = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_ServantNotActive = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -218,9 +227,9 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableServer_POA_ServantNotActive;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POA_WrongAdapter = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_WrongAdapter = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -235,9 +244,9 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableServer_POA_WrongAdapter;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:34
+// be\be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *>  * const _tao_fields_PortableServer_POA_WrongPolicy = 0;
+static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_WrongPolicy = 0;
 static TAO::TypeCode::Struct<char const *,
                              TAO::TypeCode::Struct_Field<char const *> const *,
                              CORBA::tk_except,
@@ -252,7 +261,7 @@ static TAO::TypeCode::Struct<char const *,
   &_tao_tc_PortableServer_POA_WrongPolicy;
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:73
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
@@ -270,7 +279,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 
 
@@ -342,7 +351,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -411,7 +420,7 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -483,7 +492,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -555,7 +564,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -627,7 +636,9 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+#if (TAO_HAS_MINIMUM_POA == 0)
 
 template<>
 CORBA::Boolean
@@ -698,8 +709,10 @@ CORBA::Boolean operator>>= (
       );
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -771,7 +784,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -843,7 +856,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -915,7 +928,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -987,7 +1000,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -1058,8 +1071,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_cs.cpp:50
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -1147,11 +1160,15 @@ CORBA::Boolean operator>>= (
         PortableServer::POA::InvalidPolicy
       >;
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
   template class
     TAO::Any_Dual_Impl_T<
         PortableServer::POA::NoServant
       >;
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
   template class
     TAO::Any_Dual_Impl_T<
         PortableServer::POA::ObjectAlreadyActive
@@ -1209,11 +1226,15 @@ CORBA::Boolean operator>>= (
         PortableServer::POA::InvalidPolicy \
       >
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 # pragma instantiate \
     TAO::Any_Dual_Impl_T< \
         PortableServer::POA::NoServant \
       >
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
 # pragma instantiate \
     TAO::Any_Dual_Impl_T< \
         PortableServer::POA::ObjectAlreadyActive \
@@ -1254,4 +1275,4 @@ CORBA::Boolean operator>>= (
         PortableServer::POAList \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 4f9c06a0b02..635e442fe20 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "PortableServer.h"
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 8561dea5ceb..a697a97cc06 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -71,13 +71,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -1399,7 +1392,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongPolicy *&);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "PortableServerC.inl"
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
index 7b398087979..1de9e73652c 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
@@ -37,8 +37,10 @@
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_RequestProcessingPolicyValue[] =
   {
@@ -66,7 +68,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:73
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
@@ -84,7 +86,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -112,7 +114,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -205,3 +207,5 @@ operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
index f0c633a6868..f7af5bd7de2 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "RequestProcessingPolicyC.h"
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
index 67c5ae89cfa..016f874d65c 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
@@ -54,13 +54,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -282,7 +275,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "RequestProcessingPolicyC.inl"
diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp
index 670922cfcb4..408c6c3eeaa 100644
--- a/TAO/tao/PortableServer/ServantActivatorA.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorA.cpp
@@ -45,7 +45,7 @@ static TAO::TypeCode::Objref<char const *,
   _tao_tc_PortableServer_ServantActivator (
     "IDL:omg.org/PortableServer/ServantActivator:2.3",
     "ServantActivator");
-
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantActivator =
@@ -137,6 +137,6 @@ operator>>= (
         PortableServer::ServantActivator \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp
index f22a0f63a55..fbe6d0b69a9 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "ServantActivatorC.h"
diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h
index b1c58eb851b..868281d4714 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.h
+++ b/TAO/tao/PortableServer/ServantActivatorC.h
@@ -56,13 +56,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -252,7 +245,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "ServantActivatorC.inl"
diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp
index 0c86a68db2c..ded42fe1f98 100644
--- a/TAO/tao/PortableServer/ServantLocatorA.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorA.cpp
@@ -46,7 +46,7 @@ static TAO::TypeCode::Objref<char const *,
   _tao_tc_PortableServer_ServantLocator (
     "IDL:omg.org/PortableServer/ServantLocator:2.3",
     "ServantLocator");
-
+  
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantLocator =
@@ -138,6 +138,6 @@ operator>>= (
         PortableServer::ServantLocator \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp
index 0e444bc3336..38df9de3e49 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "ServantLocatorC.h"
diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h
index 0f8b2d85acb..4971a560e60 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.h
+++ b/TAO/tao/PortableServer/ServantLocatorC.h
@@ -57,13 +57,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -257,7 +250,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "ServantLocatorC.inl"
diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp
index ab0301ae9d7..2f25539e56a 100644
--- a/TAO/tao/PortableServer/ServantManagerC.cpp
+++ b/TAO/tao/PortableServer/ServantManagerC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "ServantManagerC.h"
diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h
index 9896e0b2b0d..fec5ab729c2 100644
--- a/TAO/tao/PortableServer/ServantManagerC.h
+++ b/TAO/tao/PortableServer/ServantManagerC.h
@@ -51,13 +51,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -219,7 +212,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "ServantManagerC.inl"
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
index 7e262aa242d..94e48d32305 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
@@ -37,8 +37,10 @@
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_ServantRetentionPolicyValue[] =
   {
@@ -65,7 +67,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:73
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
@@ -83,7 +85,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -111,7 +113,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -204,3 +206,5 @@ operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
index e41fe98cc21..b7e887f1d9d 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "ServantRetentionPolicyC.h"
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
index fd327e58922..fdc89af9610 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
@@ -54,13 +54,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -281,7 +274,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "ServantRetentionPolicyC.inl"
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp
index 3dbf466273f..6ad612fff92 100644
--- a/TAO/tao/PortableServer/ThreadPolicyA.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp
@@ -37,8 +37,10 @@
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Basic_Impl_T.h"
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
+// be\be_visitor_typecode/enum_typecode.cpp:34
 
 static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_PortableServer_ThreadPolicyValue[] =
   {
@@ -65,7 +67,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:73
+// be\be_visitor_typecode/objref_typecode.cpp:73
 
 static TAO::TypeCode::Objref<char const *,
                              CORBA::tk_local_interface,
@@ -83,7 +85,7 @@ namespace PortableServer
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -111,7 +113,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 template<>
 CORBA::Boolean
@@ -204,3 +206,5 @@ operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp
index 59b4dd447ea..06b928d850d 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:302
+// be\be_codegen.cpp:291
 
 
 #include "ThreadPolicyC.h"
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h
index 947e51e41f9..5b2d721ed4f 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.h
+++ b/TAO/tao/PortableServer/ThreadPolicyC.h
@@ -54,13 +54,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
@@ -281,7 +274,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:969
+// be\be_codegen.cpp:947
 
 #if defined (__ACE_INLINE__)
 #include "ThreadPolicyC.inl"