diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
| commit | 4df04cc27ef1e77bcc941afaba7d4c943b98a936 (patch) | |
| tree | 5054c2bde24d048d4790ff659b61be0838cd0d69 /TAO/etc | |
| parent | b723802f85ac66026a503827677a2fb1e9a77933 (diff) | |
| download | ATCD-4df04cc27ef1e77bcc941afaba7d4c943b98a936.tar.gz | |
Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'TAO/etc')
| -rw-r--r-- | TAO/etc/tao_pi.doxygen | 3 | ||||
| -rw-r--r-- | TAO/etc/tao_pi_server.doxygen | 3 | ||||
| -rw-r--r-- | TAO/etc/tao_rtcorba.doxygen | 3 | ||||
| -rw-r--r-- | TAO/etc/tao_rtportableserver.doxygen | 3 | ||||
| -rw-r--r-- | TAO/etc/tao_strategies.doxygen | 7 | ||||
| -rw-r--r-- | TAO/etc/tao_transportcurrent.doxygen | 3 | ||||
| -rw-r--r-- | TAO/etc/tao_ziop.doxygen | 3 |
7 files changed, 18 insertions, 7 deletions
diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen index 1a6ca66d3b0..4574c930d52 100644 --- a/TAO/etc/tao_pi.doxygen +++ b/TAO/etc/tao_pi.doxygen @@ -125,7 +125,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE + ACE_INLINE=inline \ + TAO_HAS_INTERCEPTORS=1 EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ ACE_CACHE_MAP_MANAGER diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen index df393973b5b..7e423a29c28 100644 --- a/TAO/etc/tao_pi_server.doxygen +++ b/TAO/etc/tao_pi_server.doxygen @@ -125,7 +125,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE + ACE_INLINE=inline \ + TAO_HAS_INTERCEPTORS=1 EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ ACE_CACHE_MAP_MANAGER diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen index f327d455f4d..4bd083c73b7 100644 --- a/TAO/etc/tao_rtcorba.doxygen +++ b/TAO/etc/tao_rtcorba.doxygen @@ -125,7 +125,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE + ACE_INLINE=inline \ + TAO_HAS_CORBA_MESSAGING=1 EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ ACE_CACHE_MAP_MANAGER diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen index 1db620e26fb..b740a3bed35 100644 --- a/TAO/etc/tao_rtportableserver.doxygen +++ b/TAO/etc/tao_rtportableserver.doxygen @@ -125,7 +125,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE + ACE_INLINE=inline \ + TAO_HAS_CORBA_MESSAGING=1 EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ ACE_CACHE_MAP_MANAGER diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen index c020f47b344..2ac0de9e15f 100644 --- a/TAO/etc/tao_strategies.doxygen +++ b/TAO/etc/tao_strategies.doxygen @@ -125,7 +125,12 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE + ACE_INLINE=inline \ + TAO_HAS_COIOP=1 \ + TAO_HAS_DIOP=1 \ + TAO_HAS_SCIOP=1 \ + TAO_HAS_SHMIOP=1 \ + TAO_HAS_UIOP=1 EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ ACE_CACHE_MAP_MANAGER diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen index 5c09e787a0b..470407c0d70 100644 --- a/TAO/etc/tao_transportcurrent.doxygen +++ b/TAO/etc/tao_transportcurrent.doxygen @@ -125,7 +125,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE + ACE_INLINE=inline \ + TAO_HAS_TRANSPORT_CURRENT=1 EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ ACE_CACHE_MAP_MANAGER diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen index 1c29834d3f6..f4c5dcbe874 100644 --- a/TAO/etc/tao_ziop.doxygen +++ b/TAO/etc/tao_ziop.doxygen @@ -125,7 +125,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE + ACE_INLINE=inline \ + TAO_HAS_CORBA_MESSAGING=1 EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ ACE_CACHE_MAP_MANAGER |