1 files changed, 6 insertions, 16 deletions
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h
index 9f81e8c9076..e66fe4f6ec0 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.h
+++ b/TAO/tao/RTPortableServer/RTPortableServer.h
@@ -26,26 +26,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_RTPortableServer_Export TAO_RT_POA_Initializer
+#include "tao/RTCORBA/RTCORBA.h"
+
+class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer
 {
 public:
-  static int init (void);
-  // Used to force the initialization of the ORB code.
+  // Constructor.
+  TAO_RTPortableServer_Initializer (void);
 };
 
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_Module_Initializer) (void);
-
-static TAO_Module_Initializer
-TAO_Requires_RT_POA_Initializer = &TAO_RT_POA_Initializer::init;
-
-#else
-
-static int
-TAO_Requires_RT_POA_Initializer  = TAO_RT_POA_Initializer::init ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
+static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer;
 
 #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE
 #include "RTPortableServerC.h"