Skip to content

Commit

Permalink
Merge pull request #2106 from iguessthislldo/igtd/tao2maps
Browse files Browse the repository at this point in the history
Backport IDL Maps to TAO2
  • Loading branch information
jrw972 authored Oct 4, 2023
2 parents 0a5646c + 057337c commit aeca0e8
Show file tree
Hide file tree
Showing 477 changed files with 7,983 additions and 4,975 deletions.
6 changes: 6 additions & 0 deletions TAO/NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
USER VISIBLE CHANGES BETWEEN TAO-2.5.20 and TAO-2.5.21
======================================================

- TAO_IDL: Added support for the map data type, but this isn't supported in TAO
user applications except for local usage

USER VISIBLE CHANGES BETWEEN TAO-2.5.19 and TAO-2.5.20
======================================================

Expand Down
6 changes: 3 additions & 3 deletions TAO/TAO_IDL/ast/ast_argument.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ AST_Argument::AST_Argument (Direction d,
{
}

AST_Argument::~AST_Argument (void)
AST_Argument::~AST_Argument ()
{
}

Expand All @@ -123,13 +123,13 @@ AST_Argument::ast_accept (ast_visitor *visitor)
}

void
AST_Argument::destroy (void)
AST_Argument::destroy ()
{
this->AST_Field::destroy ();
}

AST_Argument::Direction
AST_Argument::direction (void)
AST_Argument::direction ()
{
return this->pd_direction;
}
Expand Down
14 changes: 7 additions & 7 deletions TAO/TAO_IDL/ast/ast_array.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ AST_Array::AST_Array (UTL_ScopedName *n,
nd);
}

AST_Array::~AST_Array (void)
AST_Array::~AST_Array ()
{
}

Expand Down Expand Up @@ -179,7 +179,7 @@ AST_Array::ast_accept (ast_visitor *visitor)

// Compute the size type of the node in question.
int
AST_Array::compute_size_type (void)
AST_Array::compute_size_type ()
{
AST_Type *type = this->base_type ();

Expand All @@ -201,19 +201,19 @@ AST_Array::compute_size_type (void)

// Data accessors.
ACE_CDR::ULong
AST_Array::n_dims (void)
AST_Array::n_dims ()
{
return this->pd_n_dims;
}

AST_Expression **
AST_Array::dims (void)
AST_Array::dims ()
{
return this->pd_dims;
}

AST_Type *
AST_Array::base_type (void) const
AST_Array::base_type () const
{
return this->pd_base_type;
}
Expand All @@ -233,13 +233,13 @@ AST_Array::set_base_type (AST_Type *nbt)
}

bool
AST_Array::legal_for_primary_key (void) const
AST_Array::legal_for_primary_key () const
{
return this->base_type ()->legal_for_primary_key ();
}

void
AST_Array::destroy (void)
AST_Array::destroy ()
{
if (this->owns_base_type_)
{
Expand Down
10 changes: 5 additions & 5 deletions TAO/TAO_IDL/ast/ast_attribute.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ AST_Attribute::AST_Attribute (bool ro,
{
}

AST_Attribute::~AST_Attribute (void)
AST_Attribute::~AST_Attribute ()
{
}

Expand All @@ -123,7 +123,7 @@ AST_Attribute::ast_accept (ast_visitor *visitor)
}

void
AST_Attribute::destroy (void)
AST_Attribute::destroy ()
{
// No need to delete our exception lists, the
// destroy() method does it. The UTL_ExceptList
Expand Down Expand Up @@ -180,19 +180,19 @@ AST_Attribute::be_add_set_exceptions (UTL_ExceptList *t)
// Data accessors.

bool
AST_Attribute::readonly (void) const
AST_Attribute::readonly () const
{
return this->pd_readonly;
}

UTL_ExceptList *
AST_Attribute::get_get_exceptions (void) const
AST_Attribute::get_get_exceptions () const
{
return this->pd_get_exceptions;
}

UTL_ExceptList *
AST_Attribute::get_set_exceptions (void) const
AST_Attribute::get_set_exceptions () const
{
return this->pd_set_exceptions;
}
Expand Down
2 changes: 1 addition & 1 deletion TAO/TAO_IDL/ast/ast_check.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ AST_record_fwd_decl (AST_Type *n)

// Check that all forward declared structs and unions were also defined.
TAO_IDL_FE_Export void
AST_check_fwd_decls (void)
AST_check_fwd_decls ()
{
AST_Type *d = 0;

Expand Down
10 changes: 5 additions & 5 deletions TAO/TAO_IDL/ast/ast_component.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ AST_Component::AST_Component (UTL_ScopedName *n,
}
}

AST_Component::~AST_Component (void)
AST_Component::~AST_Component ()
{
}

Expand Down Expand Up @@ -127,19 +127,19 @@ AST_Component::look_in_supported (UTL_ScopedName *e,
}

AST_Component *
AST_Component::base_component (void) const
AST_Component::base_component () const
{
return this->pd_base_component;
}

AST_Type **
AST_Component::supports (void) const
AST_Component::supports () const
{
return this->inherits ();
}

long
AST_Component::n_supports (void) const
AST_Component::n_supports () const
{
return this->n_inherits ();
}
Expand All @@ -160,7 +160,7 @@ AST_Component::special_lookup (UTL_ScopedName *e,
}

void
AST_Component::destroy (void)
AST_Component::destroy ()
{
this->AST_Interface::destroy ();
}
Expand Down
6 changes: 3 additions & 3 deletions TAO/TAO_IDL/ast/ast_component_fwd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ AST_ComponentFwd::AST_ComponentFwd (AST_Interface *dummy,
{
}

AST_ComponentFwd::~AST_ComponentFwd (void)
AST_ComponentFwd::~AST_ComponentFwd ()
{
}

Expand All @@ -40,13 +40,13 @@ AST_ComponentFwd::ast_accept (ast_visitor *visitor)
}

void
AST_ComponentFwd::destroy (void)
AST_ComponentFwd::destroy ()
{
this->AST_InterfaceFwd::destroy ();
}

bool
AST_ComponentFwd::is_fwd (void)
AST_ComponentFwd::is_fwd ()
{
return true; // This is a fwd declared type
}
Expand Down
4 changes: 2 additions & 2 deletions TAO/TAO_IDL/ast/ast_concrete_type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ AST_ConcreteType::AST_ConcreteType (AST_Decl::NodeType nt,
{
}

AST_ConcreteType::~AST_ConcreteType (void)
AST_ConcreteType::~AST_ConcreteType ()
{
}

void
AST_ConcreteType::destroy (void)
AST_ConcreteType::destroy ()
{
this->AST_Type::destroy ();
}
Expand Down
6 changes: 3 additions & 3 deletions TAO/TAO_IDL/ast/ast_connector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,18 @@ AST_Connector::AST_Connector (
}
}

AST_Connector::~AST_Connector (void)
AST_Connector::~AST_Connector ()
{
}

AST_Connector *
AST_Connector::base_connector (void) const
AST_Connector::base_connector () const
{
return dynamic_cast<AST_Connector*> (this->pd_base_component);
}

void
AST_Connector::destroy (void)
AST_Connector::destroy ()
{
this->AST_Component::destroy ();
}
Expand Down
12 changes: 6 additions & 6 deletions TAO/TAO_IDL/ast/ast_constant.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ AST_Constant::AST_Constant (AST_Expression::ExprType t,
}
}

AST_Constant::~AST_Constant (void)
AST_Constant::~AST_Constant ()
{
}

Expand Down Expand Up @@ -154,7 +154,7 @@ AST_Constant::ast_accept (ast_visitor *visitor)
}

void
AST_Constant::destroy (void)
AST_Constant::destroy ()
{
if (this->pd_constant_value != 0)
{
Expand All @@ -169,19 +169,19 @@ AST_Constant::destroy (void)
// Data accessors.

AST_Expression *
AST_Constant::constant_value (void)
AST_Constant::constant_value ()
{
return this->pd_constant_value;
}

AST_Expression::ExprType
AST_Constant::et (void)
AST_Constant::et ()
{
return this->pd_et;
}

bool
AST_Constant::ifr_added (void)
AST_Constant::ifr_added ()
{
return this->ifr_added_;
}
Expand All @@ -193,7 +193,7 @@ AST_Constant::ifr_added (bool val)
}

UTL_ScopedName *
AST_Constant::enum_full_name (void)
AST_Constant::enum_full_name ()
{
if (this->pd_et == AST_Expression::EV_enum)
{
Expand Down
6 changes: 3 additions & 3 deletions TAO/TAO_IDL/ast/ast_consumes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ AST_Consumes::AST_Consumes (UTL_ScopedName *n,
{
}

AST_Consumes::~AST_Consumes (void)
AST_Consumes::~AST_Consumes ()
{
}

AST_Type *
AST_Consumes::consumes_type (void) const
AST_Consumes::consumes_type () const
{
return this->field_type ();
}
Expand All @@ -40,7 +40,7 @@ AST_Consumes::ast_accept (ast_visitor *visitor)
}

void
AST_Consumes::destroy (void)
AST_Consumes::destroy ()
{
this->AST_Field::destroy ();
}
Expand Down
Loading

0 comments on commit aeca0e8

Please sign in to comment.