summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/NEWS5
-rw-r--r--TAO/TAO_IDL/driver/drv_args.cpp6
-rw-r--r--TAO/TAO_IDL/include/idl_version.h2
3 files changed, 7 insertions, 6 deletions
diff --git a/TAO/NEWS b/TAO/NEWS
index cdd17edf366..d907428cfc8 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -5,6 +5,11 @@ USER VISIBLE CHANGES BETWEEN TAO-2.5.3 and TAO-2.5.4
of servers which use the ImR heavily and each of
them does a frequent shutdown/start cycle
+. The TAO_IDL frontend library now parses all IDL4
+ annotation-related syntax: using and defining annotations.
+ Use the tao_idl command-line options --idl-version and
+ --unknown-annotations to control annotation parsing.
+
USER VISIBLE CHANGES BETWEEN TAO-2.5.2 and TAO-2.5.3
====================================================
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 1f81a9f6c11..f2ef45176fa 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -705,10 +705,6 @@ process_long_option(long ac, char **av, long &i)
}
else
{
- ACE_DEBUG ((LM_ERROR,
- ACE_TEXT ("Unknown long option: %C\n"),
- long_option
- ));
- idl_global->parse_args_exit (1);
+ be_global->parse_args (i, av);
}
}
diff --git a/TAO/TAO_IDL/include/idl_version.h b/TAO/TAO_IDL/include/idl_version.h
index d76d79dff12..03255a88962 100644
--- a/TAO/TAO_IDL/include/idl_version.h
+++ b/TAO/TAO_IDL/include/idl_version.h
@@ -17,7 +17,7 @@
* NOTE: If updated, idlVersionNames in util/idl_version.cpp must be updated
* as well!
*/
-enum TAO_IDL_FE_Export SpecificIdlVersion
+enum SpecificIdlVersion
{
/// Invalid Version Value
IDL_VERSION_INVALID,