summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-06-06 16:08:57 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-06-06 16:08:57 +0000
commitbbc0cbfecac6e3100a5918b09183ea179cc2e8db (patch)
tree4edcda16da0e0945eebbaed601d6d68576597e5d
parent8d21e931f92e378fb0ee73a76af4ba5a1ad88c95 (diff)
downloadATCD-bbc0cbfecac6e3100a5918b09183ea179cc2e8db.tar.gz
ChangeLogTag: Wed Jun 06 16:07:00 UTC 2007 Simon Massey <sma@prismtech.com>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/TAO_IDL/ast/ast_type.cpp3
2 files changed, 8 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e00d3d6459e..10b68618160 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 06 16:07:00 UTC 2007 Simon Massey <sma@prismtech.com>
+
+ * TAO_IDL/ast/ast_type.cpp:
+
+ Remove an assert (that can get treiggered legaly during
+ idl compilation when errors have been seen, and we are
+ only checking code further down).
+
Wed Jun 6 12:05:22 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp:
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index 48384e0faae..6fccb1fd638 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -132,9 +132,6 @@ AST_Type::size_type (void)
void
AST_Type::size_type (AST_Type::SIZE_TYPE st)
{
- // Precondition - you cannot set somebody's sizetype to unknown.
- ACE_ASSERT (st != AST_Type::SIZE_UNKNOWN);
-
// Size type can be VARIABLE or FIXED.
if (this->size_type_ == AST_Type::SIZE_UNKNOWN) // not set yet
{