summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Hornsey <hornseyf@objectcomputing.com>2020-06-05 12:02:36 -0500
committerFred Hornsey <hornseyf@objectcomputing.com>2020-06-05 12:02:36 -0500
commit757eb4f5a158b60c233062fa0a8543ffaaced513 (patch)
tree7618efc754a9bfab7277dc335cbfeba3f180cc06
parent4e92865d520dac46061275197f150ea75f99219f (diff)
downloadATCD-757eb4f5a158b60c233062fa0a8543ffaaced513.tar.gz
Respond to Review in #1135
-rw-r--r--TAO/TAO_IDL/util/utl_global.cpp4
-rw-r--r--TAO/tests/IDLv4/anonymous_types/test.idl8
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 1292fa18d53..38ada2091ad 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -1845,14 +1845,14 @@ bool
IDL_GlobalData::anon_error (void) const
{
return anon_type_diagnostic_ == ANON_TYPE_ERROR &&
- !(idl_version_ >= IDL_VERSION_4);
+ idl_version_ < IDL_VERSION_4;
}
bool
IDL_GlobalData::anon_warning (void) const
{
return anon_type_diagnostic_ == ANON_TYPE_WARNING &&
- !(idl_version_ >= IDL_VERSION_4);
+ idl_version_ < IDL_VERSION_4;
}
bool
diff --git a/TAO/tests/IDLv4/anonymous_types/test.idl b/TAO/tests/IDLv4/anonymous_types/test.idl
index b7682ed0b61..eee64242483 100644
--- a/TAO/tests/IDLv4/anonymous_types/test.idl
+++ b/TAO/tests/IDLv4/anonymous_types/test.idl
@@ -5,13 +5,21 @@
struct TestStruct {
short short_array[10];
+ short another_short_array[10];
sequence<long> long_sequence;
+ sequence<long> another_long_sequence;
sequence<long, 3> bounded_long_sequence;
+ sequence<long, 3> another_bounded_long_sequence;
};
// Another struct, different lengths
struct AnotherTestStruct {
short short_array[9];
+ short another_short_array[9];
+ short another_short_10_array[10];
sequence<long> long_sequence;
+ sequence<long> another_long_sequence;
sequence<long, 4> bounded_long_sequence;
+ sequence<long, 4> another_bounded_long_sequence;
+ sequence<long, 3> another_bounded_3_long_sequence;
};