summaryrefslogtreecommitdiff
path: root/TAO/tao/RT_Current.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/RT_Current.h')
-rw-r--r--TAO/tao/RT_Current.h20
1 files changed, 2 insertions, 18 deletions
diff --git a/TAO/tao/RT_Current.h b/TAO/tao/RT_Current.h
index cf2f0a5d024..b0798010d2e 100644
--- a/TAO/tao/RT_Current.h
+++ b/TAO/tao/RT_Current.h
@@ -22,22 +22,12 @@
#if (TAO_HAS_RT_CORBA == 1)
#include "tao/RTCORBAS.h"
-#include "tao/LocalObject.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_Export TAO_RT_Current :
- public RTCORBA::Current,
- public CORBA::LocalObject
+class TAO_Export TAO_RT_Current : public RTCORBA::Current
{
// = TITLE
// RTCORBA::Current interface iplementation.
@@ -46,7 +36,7 @@ class TAO_Export TAO_RT_Current :
// Allows setting/getting the priority of the current thread.
//
public:
- TAO_RT_Current (TAO_ORB_Core *orb_core);
+ TAO_RT_Current (void);
// Default constructor.
virtual ~TAO_RT_Current (void);
@@ -64,8 +54,6 @@ public:
private:
- TAO_ORB_Core *orb_core_;
- // ORB Core that owns us.
};
@@ -73,10 +61,6 @@ private:
# include "tao/RT_Current.i"
#endif /* __ACE_INLINE__ */
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
#endif /* TAO_HAS_RT_CORBA == 1 */
#include "ace/post.h"