diff options
Diffstat (limited to 'TAO/tao/Condition.h')
| -rw-r--r-- | TAO/tao/Condition.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index 5a1d1bada70..c167bf85e0b 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "tao/orbconf.h" +#include "orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,11 +24,8 @@ #include "ace/Condition_T.h" #include "ace/Global_Macros.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; -ACE_END_VERSIONED_NAMESPACE_DECL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Condition @@ -109,14 +106,12 @@ private: ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &)) }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -#include "tao/Condition.inl" +#include "Condition.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/Condition.cpp" +#include "Condition.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) |