summaryrefslogtreecommitdiff
path: root/TAO/etc
diff options
context:
space:
mode:
authormcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-01-20 12:11:28 +0000
committermcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-01-20 12:11:28 +0000
commit1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5 (patch)
tree78fc0571a66bb48c5b2565e10ceef69cfe5afff2 /TAO/etc
parent6f8f4ebd99e45fe3e24a40c6cc7cf03bf8d31c24 (diff)
downloadATCD-1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5.tar.gz
Merged RemedyWork branch.
ChangeLogTag: Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'TAO/etc')
-rw-r--r--TAO/etc/tao.doxygen10
-rw-r--r--TAO/etc/tao_anytypecode.doxygen6
-rw-r--r--TAO/etc/tao_av.doxygen6
-rw-r--r--TAO/etc/tao_compression.doxygen6
-rw-r--r--TAO/etc/tao_cosevent.doxygen6
-rw-r--r--TAO/etc/tao_cosnaming.doxygen6
-rw-r--r--TAO/etc/tao_cosnotification.doxygen6
-rw-r--r--TAO/etc/tao_costime.doxygen6
-rw-r--r--TAO/etc/tao_costrader.doxygen6
-rw-r--r--TAO/etc/tao_dynamicany.doxygen6
-rw-r--r--TAO/etc/tao_dynamicinterface.doxygen6
-rw-r--r--TAO/etc/tao_esf.doxygen6
-rw-r--r--TAO/etc/tao_ifr.doxygen6
-rw-r--r--TAO/etc/tao_implrepo.doxygen6
-rw-r--r--TAO/etc/tao_iormanip.doxygen6
-rw-r--r--TAO/etc/tao_iortable.doxygen6
-rw-r--r--TAO/etc/tao_pi.doxygen6
-rw-r--r--TAO/etc/tao_pi_server.doxygen6
-rw-r--r--TAO/etc/tao_portablegroup.doxygen6
-rw-r--r--TAO/etc/tao_portableserver.doxygen9
-rw-r--r--TAO/etc/tao_rtcorba.doxygen6
-rw-r--r--TAO/etc/tao_rtevent.doxygen6
-rw-r--r--TAO/etc/tao_rtportableserver.doxygen6
-rw-r--r--TAO/etc/tao_security.doxygen6
-rw-r--r--TAO/etc/tao_smartproxies.doxygen6
-rw-r--r--TAO/etc/tao_ssliop.doxygen6
-rw-r--r--TAO/etc/tao_strategies.doxygen6
-rw-r--r--TAO/etc/tao_transportcurrent.doxygen6
-rw-r--r--TAO/etc/tao_ziop.doxygen6
29 files changed, 63 insertions, 118 deletions
diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen
index 1d7afa3a4b0..d76d4730168 100644
--- a/TAO/etc/tao.doxygen
+++ b/TAO/etc/tao.doxygen
@@ -125,11 +125,11 @@ PREDEFINED = __ACE_INLINE__ \
ACE_END_VERSIONED_NAMESPACE_DECL \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
- ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+ ACE_INLINE \
+ TAO_Export=
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
+
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen
index 5b3f8b2a2cb..0e5ab250a70 100644
--- a/TAO/etc/tao_anytypecode.doxygen
+++ b/TAO/etc/tao_anytypecode.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen
index 600aa1796f2..2c4ef8757a5 100644
--- a/TAO/etc/tao_av.doxygen
+++ b/TAO/etc/tao_av.doxygen
@@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen
index 2039ad04d61..deec0a17d30 100644
--- a/TAO/etc/tao_compression.doxygen
+++ b/TAO/etc/tao_compression.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen
index 0abf0e6338a..f8e63aa3aa6 100644
--- a/TAO/etc/tao_cosevent.doxygen
+++ b/TAO/etc/tao_cosevent.doxygen
@@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen
index fb073a8bb74..b6eca6ff7ef 100644
--- a/TAO/etc/tao_cosnaming.doxygen
+++ b/TAO/etc/tao_cosnaming.doxygen
@@ -127,10 +127,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen
index cefdbf00909..f43b3bcc951 100644
--- a/TAO/etc/tao_cosnotification.doxygen
+++ b/TAO/etc/tao_cosnotification.doxygen
@@ -134,10 +134,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen
index bdc96d73ade..b94477dadea 100644
--- a/TAO/etc/tao_costime.doxygen
+++ b/TAO/etc/tao_costime.doxygen
@@ -127,10 +127,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen
index 4eca2f732c7..a7f565d9ea8 100644
--- a/TAO/etc/tao_costrader.doxygen
+++ b/TAO/etc/tao_costrader.doxygen
@@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen
index f79f0043319..16d2bed576c 100644
--- a/TAO/etc/tao_dynamicany.doxygen
+++ b/TAO/etc/tao_dynamicany.doxygen
@@ -127,10 +127,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen
index c240837e86b..47141d66893 100644
--- a/TAO/etc/tao_dynamicinterface.doxygen
+++ b/TAO/etc/tao_dynamicinterface.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen
index 46373c0d91a..946642ed299 100644
--- a/TAO/etc/tao_esf.doxygen
+++ b/TAO/etc/tao_esf.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen
index 2e80935d6c4..4c5016191a7 100644
--- a/TAO/etc/tao_ifr.doxygen
+++ b/TAO/etc/tao_ifr.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen
index 4e6b43b4939..ebf1f644752 100644
--- a/TAO/etc/tao_implrepo.doxygen
+++ b/TAO/etc/tao_implrepo.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen
index 0561707964c..035065a69da 100644
--- a/TAO/etc/tao_iormanip.doxygen
+++ b/TAO/etc/tao_iormanip.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen
index 7eb76951863..89c0d8e7e4a 100644
--- a/TAO/etc/tao_iortable.doxygen
+++ b/TAO/etc/tao_iortable.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen
index b5be0b2867a..1a6ca66d3b0 100644
--- a/TAO/etc/tao_pi.doxygen
+++ b/TAO/etc/tao_pi.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen
index bc25efc4bef..df393973b5b 100644
--- a/TAO/etc/tao_pi_server.doxygen
+++ b/TAO/etc/tao_pi_server.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen
index 0f75670052c..87ff0db81f2 100644
--- a/TAO/etc/tao_portablegroup.doxygen
+++ b/TAO/etc/tao_portablegroup.doxygen
@@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen
index 87a228ad556..abe30e36444 100644
--- a/TAO/etc/tao_portableserver.doxygen
+++ b/TAO/etc/tao_portableserver.doxygen
@@ -125,11 +125,10 @@ PREDEFINED = __ACE_INLINE__ \
ACE_END_VERSIONED_NAMESPACE_DECL \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
- ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+ ACE_INLINE \
+ TAO_NAMESPACE_STORAGE_CLASS=
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen
index a4fcaa639ba..f327d455f4d 100644
--- a/TAO/etc/tao_rtcorba.doxygen
+++ b/TAO/etc/tao_rtcorba.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen
index edec9108e55..d432e2ee3d0 100644
--- a/TAO/etc/tao_rtevent.doxygen
+++ b/TAO/etc/tao_rtevent.doxygen
@@ -135,10 +135,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen
index b28768d4240..1db620e26fb 100644
--- a/TAO/etc/tao_rtportableserver.doxygen
+++ b/TAO/etc/tao_rtportableserver.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen
index 2e299dbd542..64e1f3a9ce2 100644
--- a/TAO/etc/tao_security.doxygen
+++ b/TAO/etc/tao_security.doxygen
@@ -131,10 +131,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen
index 585cee2403d..83894b34ad1 100644
--- a/TAO/etc/tao_smartproxies.doxygen
+++ b/TAO/etc/tao_smartproxies.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen
index 5d1fe0ab11d..d0b761a7fbc 100644
--- a/TAO/etc/tao_ssliop.doxygen
+++ b/TAO/etc/tao_ssliop.doxygen
@@ -131,10 +131,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen
index 10a04d22c6f..c020f47b344 100644
--- a/TAO/etc/tao_strategies.doxygen
+++ b/TAO/etc/tao_strategies.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen
index 4fb7755ae42..5c09e787a0b 100644
--- a/TAO/etc/tao_transportcurrent.doxygen
+++ b/TAO/etc/tao_transportcurrent.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references
diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen
index 69e6dc3ea8b..1c29834d3f6 100644
--- a/TAO/etc/tao_ziop.doxygen
+++ b/TAO/etc/tao_ziop.doxygen
@@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \
TAO_BEGIN_VERSIONED_NAMESPACE_DECL \
TAO_END_VERSIONED_NAMESPACE_DECL \
ACE_INLINE
-EXPAND_AS_DEFINED = ACE_RCSID \
- ACE_UNIMPLEMENTED_FUNC \
- ACE_CACHE_MAP_MANAGER \
- ACE_THROW_SPEC
+EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \
+ ACE_CACHE_MAP_MANAGER
#---------------------------------------------------------------------------
# Configuration::additions related to external references