diff options
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/Condition.h | 2 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynamicAnyC.h | 3 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RTCORBAC.h | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index b27ac808011..3ddeccdb133 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -14,7 +14,7 @@ #define TAO_CONDITION_H #include "ace/pre.h" #include "orbconf.h" - +#include "ace/Synch_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index 1d6e15fa236..d5cfe902931 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -22,7 +22,8 @@ #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_ #define _TAO_IDL_ORIG_DYNAMICANYC_H_ -#ifndef TAO_DYNAMICANY_SAFE_INCLUDE +#if !defined(TAO_DYNAMICANY_SAFE_INCLUDE) && \ + !defined(TAO_INSTANTIATING_TEMPLATES) #error "You should not include DynamicAnyC.h directly, use DynamicAny.h" #endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */ diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 582ca7b9703..c5316b8b29f 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -44,7 +44,8 @@ class TAO_Network_Priority_Mapping_Manager_var; class TAO_Network_Priority_Mapping_Manager_out; class TAO_Network_Priority_Mapping; -#ifndef TAO_RTCORBA_SAFE_INCLUDE +#if !defined(TAO_RTCORBA_SAFE_INCLUDE) && \ + !defined(TAO_INSTANTIATING_TEMPLATES) #error "You should not include RTCORBAC.h directly, use RTCORBA.h" #endif /* !TAO_RTCORBA_SAFE_INCLUDE */ |