summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Hornsey <hornseyf@objectcomputing.com>2021-07-20 15:37:50 -0500
committerFred Hornsey <hornseyf@objectcomputing.com>2021-07-20 15:37:50 -0500
commit9956106ce26e3c53de6e9cf2d19e3a6d6ca7559c (patch)
tree24aa2d5b806fc859127506f95da9388538db01fc
parent8ece0e448f1905c36ce5aaad498c5565550c0021 (diff)
downloadATCD-9956106ce26e3c53de6e9cf2d19e3a6d6ca7559c.tar.gz
Correct NEWS and Examples
-rw-r--r--TAO/NEWS2
-rw-r--r--TAO/tao/idl_features.h16
2 files changed, 11 insertions, 7 deletions
diff --git a/TAO/NEWS b/TAO/NEWS
index c8903aefc78..6c676ae41df 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -7,7 +7,7 @@ USER VISIBLE CHANGES BETWEEN TAO-3.0.2 and TAO-3.0.3
by the CORBA specification.
. Added the `tao/idl_features.h` header file for getting the IDL features
- supported by IDL. See the file for example usage.
+ supported by TAO_IDL. See the file for example usage.
USER VISIBLE CHANGES BETWEEN TAO-3.0.1 and TAO-3.0.2
====================================================
diff --git a/TAO/tao/idl_features.h b/TAO/tao/idl_features.h
index 40cc7d951b8..c9453aede18 100644
--- a/TAO/tao/idl_features.h
+++ b/TAO/tao/idl_features.h
@@ -13,9 +13,9 @@
* // version.
* # define TAO_IDL_IDL_VERSION 0x30000
* # include "tao/idl_features.h"
- * # define USE_FEATURE defined TAO_IDL_HAS_FEATURE && TAO_IDL_HAS_FEATURE
- * #else
- * # define USE_FEATURE 0
+ * # if defined TAO_IDL_HAS_FEATURE && TAO_IDL_HAS_FEATURE
+ * # define USE_FEATURE
+ * # endif
* #endif
*
* In IDL it can be used like this if you want to be compatible with older
@@ -23,10 +23,14 @@
*
* #if defined __TAO_IDL_FEATURES
* # include __TAO_IDL_FEATURES
- * # define USE_FEATURE defined TAO_IDL_HAS_FEATURE && TAO_IDL_HAS_FEATURE
- * #else
- * # define USE_FEATURE 0
+ * # if defined TAO_IDL_HAS_FEATURE && TAO_IDL_HAS_FEATURE
+ * # define USE_FEATURE
+ * # endif
* #endif
+ *
+ * Note that support for annotations and anonymous types in IDL4 predate this
+ * file, so they are a potential special case depending on what ACE/TAO is
+ * being used.
*/
#ifndef TAO_IDL_FEATURES_H