summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-21 16:34:13 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-11-21 16:34:13 +0000
commitb3d6e6e63a074927dd4d02a9e289137a3bf88a3a (patch)
tree800799604af19813a40a316b0e9d4c65d01a175d
parentc11496f78a63747771790d1bd2b9b24b02613b1f (diff)
downloadATCD-b3d6e6e63a074927dd4d02a9e289137a3bf88a3a.tar.gz
ChangeLogTag: Fri Nov 21 10:31:38 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/TAO_IDL/ast/ast_decl.cpp6
-rw-r--r--TAO/TAO_IDL/be/be_typedef.cpp7
-rw-r--r--TAO/TAO_IDL/include/ast_decl.h1
4 files changed, 23 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e90a3d81619..c71afe7112d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Nov 21 10:31:38 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * TAO_IDL/ast/ast_decl.cpp:
+ * TAO_IDL/be/be_typedef.cpp:
+ * TAO_IDL/include/ast_decl.h:
+
+ Fixed error in logic of determining whether a sequence
+ is anonymous or typedef'd.
+
Fri Nov 21 08:55:16 2003 Charlie Frasch <cfrasch@atdesk.com>
* utils/wxNamingViewer/Makefile:
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 86b01e460d1..d1459b4dda9 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -943,6 +943,12 @@ AST_Decl::anonymous (void) const
return this->anonymous_;
}
+void
+AST_Decl::anonymous (idl_bool val)
+{
+ this->anonymous_ = val;
+}
+
idl_bool
AST_Decl::typeid_set (void) const
{
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
index ff8e0675230..a9d637fee2a 100644
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_typedef.cpp
@@ -56,6 +56,13 @@ be_typedef::be_typedef (AST_Type *bt,
be_type (AST_Decl::NT_typedef,
n)
{
+ AST_Type *pbt = this->primitive_base_type ();
+ AST_Decl::NodeType nt = pbt->node_type ();
+
+ if (nt = AST_Decl::NT_sequence)
+ {
+ pbt->anonymous (I_FALSE);
+ }
}
void
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 2f5d8a684d4..14573a53f57 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -217,6 +217,7 @@ public:
// Accessors for the version_ member.
idl_bool anonymous (void) const;
+ void anonymous (idl_bool val);
// Accessors for the anonymous_ member.
idl_bool typeid_set (void) const;