summaryrefslogtreecommitdiff
path: root/TAO/tao/IORManipulation/IORManipulation.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/IORManipulation/IORManipulation.h')
-rw-r--r--TAO/tao/IORManipulation/IORManipulation.h21
1 files changed, 7 insertions, 14 deletions
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index 9ad320bc8d0..0666e0ef6b7 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -19,26 +19,23 @@
#ifndef TAO_IOR_MANIPULATION_H
#define TAO_IOR_MANIPULATION_H
-
#include /**/ "ace/pre.h"
#include "tao/LocalObject.h"
-#include "tao/IORManipulation/IORManip_Loader.h"
+#include "IORManip_Loader.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/IORManipulation/IORC.h"
+#include "IORC.h"
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable:4250)
#endif /* _MSC_VER */
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_IOR_Manipulation_impl
+class TAO_IORManip_Export TAO_IOR_Manipulation_impl
: public TAO_IOP::TAO_IOR_Manipulation,
public TAO_Local_RefCounted_Object
{
@@ -53,6 +50,9 @@ public:
TAO_IOR_Manipulation_impl (void);
// constructor
+ ~TAO_IOR_Manipulation_impl (void);
+ // destructor
+
virtual CORBA::Object_ptr merge_iors (
const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -153,20 +153,13 @@ public:
CORBA::SystemException,
TAO_IOP::EmptyProfileList
));
-
-protected:
-
- ~TAO_IOR_Manipulation_impl (void);
- // destructor
+private:
};
-TAO_END_VERSIONED_NAMESPACE_DECL
-
#if defined(_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */
#include /**/ "ace/post.h"
-
#endif /* TAO_IOR_MANIPULATION_H */