Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IDL map: more TAO2 compatibility #2141

Merged
merged 1 commit into from
Oct 6, 2023
Merged

IDL map: more TAO2 compatibility #2141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions TAO/TAO_IDL/ast/ast_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ AST_Map::AST_Map (AST_Expression *ms,
|| vnt == AST_Decl::NT_param_holder;
}

AST_Map::~AST_Map ()
{}

// Public operations.

bool
Expand Down
10 changes: 5 additions & 5 deletions TAO/TAO_IDL/be/be_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ be_map::gen_name ()
0);
}

std::snprintf (namebuf,
ACE_OS::snprintf (namebuf,
NAMEBUFSIZE,
"_tao_map_%s_%s_",
kt->flat_name (), vt->flat_name ());
Expand All @@ -155,10 +155,10 @@ be_map::gen_name ()
if (this->unbounded () == false)
{
char ulval_str [NAMEBUFSIZE];
std::snprintf (ulval_str,
NAMEBUFSIZE,
"_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
this->max_size ()->ev ()->u.ulval);
ACE_OS::snprintf (ulval_str,
NAMEBUFSIZE,
"_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
this->max_size ()->ev ()->u.ulval);
ACE_OS::strcat (namebuf,
ulval_str);
}
Expand Down
2 changes: 1 addition & 1 deletion TAO/TAO_IDL/include/ast_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class TAO_IDL_FE_Export AST_Map : public virtual AST_ConcreteType
bool local,
bool abstract);

virtual ~AST_Map () = default;
virtual ~AST_Map ();

virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
// Are we or the node represented by node involved in recursion.
Expand Down
Loading