ChangeLogTag: Mon Jul 4 12:05:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

24 files changed, 30 insertions, 265 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d9fbe316592..60b19551edf 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,33 @@
+Mon Jul  4 12:05:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h:
+        * orbsvcs/orbsvcs/PortableGroup/MIOP.h:
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h:
+        * tao/PICurrent_Loader.h:
+        * tao/BiDir_GIOP/BiDirGIOP.h:
+        * tao/CodecFactory/CodecFactory.h:
+        * tao/DynamicAny/DynamicAny.h:
+        * tao/DynamicInterface/Dynamic_Adapter_Impl.h:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.h:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h:
+        * tao/IORManipulation/IORManip_Loader.h:
+        * tao/IORTable/IORTable.h:
+        * tao/ImR_Client/ImR_Client.h:
+        * tao/Messaging/Messaging.h:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h:
+        * tao/PI/PI.h:
+        * tao/PI/PolicyFactory_Loader.h:
+        * tao/PI_Server/PI_Server.h:
+        * tao/PortableServer/PortableServer.h:
+        * tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h:
+        * tao/TypeCodeFactory/TypeCodeFactory_Loader.h:
+        * tao/Valuetype/Valuetype_Adapter_Impl.h:
+          Removed usage of ACE_HAS_BROKEN_STATIC_CONSTRUCTORS. This seems
+          to be used for older broken VxWorks versions but we don't need
+          this anymore. Zapped the usage of this and the workaround we
+          had in TAO. This fixes bugzilla bug 2177
+
 Mon Jul  4 11:01:12  UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/ORBInitializer_Registry_Adapter.{h,cpp}:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
index 3ff14a642a5..feb04749ae6 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
@@ -61,19 +61,8 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_FT_ClientService_Activate)
 ACE_FACTORY_DECLARE (TAO_FT_ClientORB, TAO_FT_ClientService_Activate)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_FT_Requires_ClientService_Activate = &TAO_FT_ClientService_Activate::Initializer;
-
-#else
-
 static int
 TAO_FT_Requires_ClientService_Activate = TAO_FT_ClientService_Activate::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_FT_CLIENTACTIVATE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
index 7b7ee354556..3f85518f093 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
@@ -51,19 +51,8 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_FT_ServerService_Activate)
 ACE_FACTORY_DECLARE (TAO_FT_ServerORB, TAO_FT_ServerService_Activate)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_FT_Requires_ServerService_Activate = &TAO_FT_ServerService_Activate::Initializer;
-
-#else
-
 static int
 TAO_FT_Requires_ServerService_Activate = TAO_FT_ServerService_Activate::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include /**/ "ace/post.h"
 #endif /*TAO_FT_ACTIVATE_H*/
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
index 09d81723188..d3d072ef39a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
@@ -30,20 +30,8 @@ namespace TAO
     static int Initializer (void);
   };
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*Module_Initializer) (void);
-
-static Module_Initializer
-Requires_MIOP_Initializer = &MIOP_Loader::Initializer;
-
-#else
-
 static int
 Requires_MIOP_Initializer = MIOP_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-}
-
 #include /**/ "ace/post.h"
 #endif /*TAO_MIOP_H*/
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
index a528c515277..c30fa026c6b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -52,22 +52,10 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_PortableGroup_Loader)
 ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_PortableGroup_Initializer =
-  &TAO_PortableGroup_Loader::Initializer;
-
-#else
-
 static int
 TAO_Requires_PortableGroup_Initializer =
   TAO_PortableGroup_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_PORTABLEGROUP_LOADER_H */
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
index 2d5fff19ff7..7e0355be4c7 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -67,20 +67,9 @@ private:
 ACE_STATIC_SVC_DECLARE (TAO_BiDirGIOP_Loader)
 ACE_FACTORY_DECLARE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_BiDirGIOP_Initializer = &TAO_BiDirGIOP_Loader::Initializer;
-
-#else
-
 static int
 TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_BIDIRGIOP_SAFE_INCLUDE
 #include "BiDirPolicyC.h"
 #undef TAO_BIDIRGIOP_SAFE_INCLUDE
diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h
index d04eb263184..5f621159c04 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -44,20 +44,9 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_CodecFactory_Loader)
 ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_CodecFactory_Initializer = &TAO_CodecFactory_Loader::Initializer;
-
-#else
-
 static int
 TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_CODECFACTORY_SAFE_INCLUDE
 #include "IOP_CodecC.h"
 #undef TAO_CODECFACTORY_SAFE_INCLUDE
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index c15a85f0035..5c944fb7895 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -44,20 +44,9 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_DynamicAny_Loader)
 ACE_FACTORY_DECLARE (TAO_DynamicAny, TAO_DynamicAny_Loader)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_DynamicAny_Initializer = &TAO_DynamicAny_Loader::Initializer;
-
-#else
-
 static int
 TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_DYNAMICANY_SAFE_INCLUDE
 #include "DynamicAnyC.h"
 #undef TAO_DYNAMICANY_SAFE_INCLUDE
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index 641f1eabc7d..d1b8ec6fc8e 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -88,21 +88,9 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_Dynamic_Adapter_Impl)
 ACE_FACTORY_DECLARE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_Request_Factory_Initializer =
-  &TAO_Dynamic_Adapter_Impl::Initializer;
-
-#else
-
 static int
 TAO_Requires_Request_Factory_Initializer =
   TAO_Dynamic_Adapter_Impl::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_DYNAMIC_ADAPTER_IMPL_H */
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index 052ea02860e..c6a2435b280 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -82,22 +82,10 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_IFR_Client_Adapter_Impl)
 ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_IFR_Client_Initializer =
-  &TAO_IFR_Client_Adapter_Impl::Initializer;
-
-#else
-
 static int
 TAO_Requires_IFR_Client_Initializer =
   TAO_IFR_Client_Adapter_Impl::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_IFR_CLIENT_ADAPTER_IMPL_H */
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
index 4b11bc97d9c..d14a32295cf 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h
@@ -53,22 +53,10 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Factory_Impl)
 ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Factory_Impl)
 
-#if defined (ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_IORInterceptor_Initializer =
-  &TAO_IORInterceptor_Adapter_Factory_Impl::Initializer;
-
-#else
-
 static int
 TAO_Requires_IORInterceptor_Initializer =
   TAO_IORInterceptor_Adapter_Factory_Impl::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_IORINTERCEPTOR_SAFE_INCLUDE
 #include "tao/IORInterceptor/IORInterceptorC.h"
 #undef TAO_IORINTERCEPTOR_SAFE_INCLUDE
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
index 5a1d9d9d1b5..f01484f7690 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ b/TAO/tao/IORManipulation/IORManip_Loader.h
@@ -47,20 +47,9 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_IORManip_Loader)
 ACE_FACTORY_DECLARE (TAO_IORManip, TAO_IORManip_Loader)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_IORManip_Initializer = &TAO_IORManip_Loader::Initializer;
-
-#else
-
 static int
 TAO_Requires_IORManip_Initializer = TAO_IORManip_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_IORMANIP_SAFE_INCLUDE
 #include "IORC.h"
 #undef TAO_IORMANIP_SAFE_INCLUDE
diff --git a/TAO/tao/IORTable/IORTable.h b/TAO/tao/IORTable/IORTable.h
index 26b097aa2dd..4044e6de93c 100644
--- a/TAO/tao/IORTable/IORTable.h
+++ b/TAO/tao/IORTable/IORTable.h
@@ -30,20 +30,9 @@ public:
   static int init (void);
 };
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_IORTable_Initializer = &TAO_IORTable_Initializer::init;
-
-#else
-
 static int
 TAO_Requires_IORTable_Initializer = TAO_IORTable_Initializer::init ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_IORTABLE_SAFE_INCLUDE
 #include "IORTableC.h"
 #undef TAO_IORTABLE_SAFE_INCLUDE
diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h
index 533533a0691..77864b79272 100644
--- a/TAO/tao/ImR_Client/ImR_Client.h
+++ b/TAO/tao/ImR_Client/ImR_Client.h
@@ -62,22 +62,9 @@ namespace TAO
     ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl)
     ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
 
-    #if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-    typedef int (*TAO_Module_Initializer) (void);
-
-    static TAO_Module_Initializer
-    TAO_Requires_ImR_Client_Initializer =
-      &TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer;
-
-    #else
-
     static int
     TAO_Requires_ImR_Client_Initializer =
       TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer ();
-
-    #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
   }
 }
 
diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h
index e0d6322830f..e8e4e34bc12 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -26,20 +26,9 @@ public:
   static int init (void);
 };
 
-# if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_Messaging_Initializer = &TAO_Messaging_Initializer::init ();
-
-#else
-
 static int
 TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_MESSAGING_SAFE_INCLUDE
 #include "MessagingC.h"
 #undef TAO_MESSAGING_SAFE_INCLUDE
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
index 765ff32d331..a41c3ab9f84 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
@@ -53,21 +53,9 @@ namespace TAO
   ACE_FACTORY_DECLARE (TAO_ORT, ORT_Adapter_Factory_Impl)
 }
 
-#if defined (ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-  TAO_Requires_ORTFactory_Initializer =
-    &TAO::ORT_Adapter_Factory_Impl::Initializer;
-
-#else
-
 static int TAO_Requires_ORTFactory_Initializer =
   TAO::ORT_Adapter_Factory_Impl::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
 #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
 #undef TAO_OBJREF_TEMPLATE_SAFE_INCLUDE
diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h
index 14c51a3aeed..eec9d3c2a91 100644
--- a/TAO/tao/PI/PI.h
+++ b/TAO/tao/PI/PI.h
@@ -33,22 +33,10 @@ public:
   static int Initializer (void);
 };
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_PI_Initializer =
-  &TAO_PI_Init::Initializer;
-
-#else
-
 static int
 TAO_Requires_PI_Initializer =
   TAO_PI_Init::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include /**/ "ace/post.h"
 
 #define TAO_PI_SAFE_INCLUDE
diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h
index 90dc4534e42..10b0280f4d9 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.h
+++ b/TAO/tao/PI/PolicyFactory_Loader.h
@@ -40,20 +40,9 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_PolicyFactory_Loader)
 ACE_FACTORY_DECLARE (TAO_PI, TAO_PolicyFactory_Loader)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_PolicyFactory_Initializer = &TAO_PolicyFactory_Loader::Initializer;
-
-#else
-
 static int
 TAO_Requires_PolicyFactory_Initializer = TAO_PolicyFactory_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_POLICYFACTORY_LOADER_H */
diff --git a/TAO/tao/PICurrent_Loader.h b/TAO/tao/PICurrent_Loader.h
index 75262505f24..6235c9b06ec 100644
--- a/TAO/tao/PICurrent_Loader.h
+++ b/TAO/tao/PICurrent_Loader.h
@@ -49,20 +49,9 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_PICurrent_Loader)
 ACE_FACTORY_DECLARE (TAO, TAO_PICurrent_Loader)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_PICurrent_Initializer = &TAO_PICurrent_Loader::Initializer;
-
-#else
-
 static int
 TAO_Requires_PICurrent_Initializer = TAO_PICurrent_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h
index 5d82f7a2d9b..e5b1afec288 100644
--- a/TAO/tao/PI_Server/PI_Server.h
+++ b/TAO/tao/PI_Server/PI_Server.h
@@ -33,22 +33,10 @@ public:
   static int Initializer (void);
 };
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_PI_Server_Initializer =
-  &TAO_PI_Server_Init::Initializer;
-
-#else
-
 static int
 TAO_Requires_PI_Server_Initializer =
   TAO_PI_Server_Init::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_PI_SERVER_SAFE_INCLUDE
 #include "PS_CurrentC.h"
 #include "ServerRequestInterceptorC.h"
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
index 30d687c5bc6..a02ed5baa1a 100644
--- a/TAO/tao/PortableServer/PortableServer.h
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -28,20 +28,9 @@ public:
   static int init (void);
 };
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_POA_Initializer = &TAO_POA_Initializer::init;
-
-#else
-
 static int
 TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_PORTABLESERVER_SAFE_INCLUDE
 #include "PortableServerC.h"
 #undef TAO_PORTABLESERVER_SAFE_INCLUDE
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
index 4ce6eed861c..b0d09a41fb4 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -251,21 +251,9 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Adapter_Impl)
 ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_TypeCodeFactory_Initializer =
-  &TAO_TypeCodeFactory_Adapter_Impl::Initializer;
-
-#else
-
 static int
 TAO_Requires_TypeCodeFactory_Initializer =
   TAO_TypeCodeFactory_Adapter_Impl::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_TYPECODEFACTORY_ADAPTER_IMPL_H */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index 71072442319..7cef34fafe8 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -50,20 +50,9 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Loader)
 ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Loader)
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_TCF_Initializer = &TAO_TypeCodeFactory_Loader::Initializer;
-
-#else
-
 static int
 TAO_Requires_TCF_Initializer = TAO_TypeCodeFactory_Loader::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #define TAO_TYPECODEFACTORY_SAFE_INCLUDE
 #include "TypeCodeFactoryC.h"
 #undef TAO_TYPECODEFACTORY_SAFE_INCLUDE
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
index f364ea7aa75..a72771e6972 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
@@ -70,21 +70,9 @@ public:
 ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Impl)
 ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
 
-#if defined (ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_Valuetype_Initializer =
-  &TAO_Valuetype_Adapter_Impl::Initializer;
-
-#else
-
 static int
 TAO_Requires_Valuetype_Initializer =
   TAO_Valuetype_Adapter_Impl::Initializer ();
 
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_VALUETYPE_ADAPTER_IMPL_H */