summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Makefile.am1
-rw-r--r--TAO/tao/Object_Loader.cpp8
-rw-r--r--TAO/tao/Object_Loader.h4
-rw-r--r--TAO/tao/Object_Loader.i1
4 files changed, 2 insertions, 12 deletions
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 25c0aa713e8..fe8188db3f9 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -779,7 +779,6 @@ nobase_include_HEADERS += \
ObjectIdListC.inl \
Object_Argument_T.inl \
Object_KeyC.inl \
- Object_Loader.i \
Object_SArgument_T.inl \
Objref_VarOut_T.inl \
OctetSeqC.inl \
diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp
index 20d7daf1619..0ae0e4ec4e5 100644
--- a/TAO/tao/Object_Loader.cpp
+++ b/TAO/tao/Object_Loader.cpp
@@ -3,12 +3,8 @@
#include "Object_Loader.h"
#include "ace/Dynamic_Service.h"
-#if !defined(__ACE_INLINE__)
-#include "Object_Loader.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
- Object_Loader,
+ACE_RCSID (tao,
+ Object_Loader,
"$Id$")
TAO_Object_Loader::~TAO_Object_Loader (void)
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index f5293c48b40..fd9279e1fd0 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -60,9 +60,5 @@ public:
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
};
-#if defined (__ACE_INLINE__)
-# include "Object_Loader.i"
-#endif /* __ACE_INLINE__ */
-
#include /**/ "ace/post.h"
#endif /* TAO_OBJECT_LOADER_H */
diff --git a/TAO/tao/Object_Loader.i b/TAO/tao/Object_Loader.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Object_Loader.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$