diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-05 13:46:16 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-05 13:46:16 +0000 |
commit | 1ecd3c1b3d0a45d42c3d4f6642808cb248094428 (patch) | |
tree | 3875b575bfda8116d9d3913cc129d402d1d75bd2 | |
parent | 2ca16fba5fdb3b0618994c47c261527fb4f9d9d9 (diff) | |
download | ATCD-1ecd3c1b3d0a45d42c3d4f6642808cb248094428.tar.gz |
ChangeLogTag: Wed Jan 5 13:46:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | TAO/tao/Makefile.am | 3 | ||||
-rw-r--r-- | TAO/tao/Valuetype/ValueFactory.cpp | 7 | ||||
-rw-r--r-- | TAO/tao/Valuetype/ValueFactory.h | 4 | ||||
-rw-r--r-- | TAO/tao/Valuetype/ValueFactory.inl | 4 | ||||
-rw-r--r-- | TAO/tao/Valuetype/ValueFactory_Map.cpp | 6 | ||||
-rw-r--r-- | TAO/tao/Valuetype/ValueFactory_Map.h | 5 | ||||
-rw-r--r-- | TAO/tao/Valuetype/ValueFactory_Map.inl | 1 | ||||
-rw-r--r-- | TAO/tao/Valuetype/Value_VarOut_T.cpp | 1 | ||||
-rw-r--r-- | TAO/tao/Valuetype/Value_VarOut_T.h | 4 | ||||
-rw-r--r-- | TAO/tao/Valuetype/Value_VarOut_T.inl | 2 |
10 files changed, 2 insertions, 35 deletions
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index 57fafb8e2ab..7e360800f17 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -1282,9 +1282,6 @@ nobase_include_HEADERS += \ Valuetype/AbstractBase.inl \ Valuetype/Sequence_T.inl \ Valuetype/ValueBase.inl \ - Valuetype/ValueFactory.inl \ - Valuetype/ValueFactory_Map.inl \ - Valuetype/Value_VarOut_T.inl \ Valuetype/AbstractBase_T.cpp \ Valuetype/Sequence_T.cpp \ Valuetype/Value_VarOut_T.cpp diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp index cf0f39e5e55..95b9b2c4912 100644 --- a/TAO/tao/Valuetype/ValueFactory.cpp +++ b/TAO/tao/Valuetype/ValueFactory.cpp @@ -1,12 +1,7 @@ #include "ValueFactory.h" #include "ace/Guard_T.h" -#if !defined (__ACE_INLINE__) -# include "ValueFactory.inl" -#endif /* ! __ACE_INLINE__ */ - - -ACE_RCSID (tao, +ACE_RCSID (Valuetype, ValueFactory, "$Id$") diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 68c209c634d..97d9f54e833 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -124,10 +124,6 @@ namespace TAO factory->_remove_ref (); } -#if defined (__ACE_INLINE__) -# include "ValueFactory.inl" -#endif /* __ACE_INLINE__) */ - #include /**/ "ace/post.h" #endif /* TAO_VALUEFACTORY_H */ diff --git a/TAO/tao/Valuetype/ValueFactory.inl b/TAO/tao/Valuetype/ValueFactory.inl deleted file mode 100644 index bf195e7d4ae..00000000000 --- a/TAO/tao/Valuetype/ValueFactory.inl +++ /dev/null @@ -1,4 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp index 9682c36eaea..a8eac3ec938 100644 --- a/TAO/tao/Valuetype/ValueFactory_Map.cpp +++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp @@ -2,11 +2,7 @@ #include "ValueFactory.h" #include "tao/CORBA_String.h" -#if !defined (__ACE_INLINE__) -# include "ValueFactory_Map.inl" -#endif /* ! __ACE_INLINE__ */ - -ACE_RCSID (tao, +ACE_RCSID (Valuetype, ValueFactory_Map, "$Id$") diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h index 16b613add41..d1927f6ce65 100644 --- a/TAO/tao/Valuetype/ValueFactory_Map.h +++ b/TAO/tao/Valuetype/ValueFactory_Map.h @@ -91,11 +91,6 @@ TAO_VALUETYPE_SINGLETON_DECLARE (TAO_Singleton, TAO_ValueFactory_Map, TAO_SYNCH_MUTEX) - -#if defined (__ACE_INLINE__) -# include "ValueFactory_Map.inl" -#endif /* __ACE_INLINE__) */ - #include /**/ "ace/post.h" #endif /* TAO_VALUEFACTORY_MAP_H */ diff --git a/TAO/tao/Valuetype/ValueFactory_Map.inl b/TAO/tao/Valuetype/ValueFactory_Map.inl deleted file mode 100644 index cfa1da318d3..00000000000 --- a/TAO/tao/Valuetype/ValueFactory_Map.inl +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp index a235bf8fee3..63da7c6a3de 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.cpp +++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp @@ -6,7 +6,6 @@ #include "tao/Valuetype/Value_VarOut_T.h" #include "tao/Valuetype/Value_CORBA_methods.h" - ACE_RCSID (Valuetype, Value_VarOut_T, "$Id$") diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index 25e2af286dd..f97c20a51ec 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -107,10 +107,6 @@ private: T *& ptr_; }; -#if defined (__ACE_INLINE__) -#include "Value_VarOut_T.inl" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "Value_VarOut_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/TAO/tao/Valuetype/Value_VarOut_T.inl b/TAO/tao/Valuetype/Value_VarOut_T.inl deleted file mode 100644 index 74e88caa0c5..00000000000 --- a/TAO/tao/Valuetype/Value_VarOut_T.inl +++ /dev/null @@ -1,2 +0,0 @@ -// $Id$ - |