diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-09-23 09:20:49 +0200 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2022-10-03 13:53:52 -0500 |
| commit | 8c727cb8f0d7d6a6330e4581db141c6376b91e68 (patch) | |
| tree | 4f67d8018e39ff08ebbc8a340e0545486421e25d | |
| parent | 7de3e969a94805d8d8969254fd4896792516ec00 (diff) | |
| download | ATCD-8c727cb8f0d7d6a6330e4581db141c6376b91e68.tar.gz | |
Merge pull request #1942 from knutpett/knutpett/const_accessor
Added const accessors for AST_Decl::local_name () and UTL_String::get_string ()
(cherry picked from commit a16ac15dd106967992baef21a91f73f002b2cb79)
# Conflicts:
# TAO/TAO_IDL/ast/ast_decl.cpp
# TAO/TAO_IDL/include/ast_decl.h
# TAO/TAO_IDL/include/utl_string.h
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_decl.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/ast_decl.h | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/utl_string.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index 9ed972220fb..1a8ed76c9f9 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -1344,7 +1344,7 @@ AST_Decl::set_name (UTL_ScopedName *n) } Identifier * -AST_Decl::local_name (void) +AST_Decl::local_name () const { return this->pd_local_name; } diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index 161f71115d9..8393eeb9a46 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -237,7 +237,7 @@ public: void set_name (UTL_ScopedName *n); - Identifier *local_name (void); + Identifier *local_name () const; void local_name (Identifier *id); Identifier *compute_local_name (const char *prefix, diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h index 9489421c04f..8b8f0a4fd78 100644 --- a/TAO/TAO_IDL/include/utl_string.h +++ b/TAO/TAO_IDL/include/utl_string.h @@ -93,7 +93,7 @@ public: virtual void dump (ACE_OSTREAM_TYPE &o); // Dump to the ostream. - char *get_string (void) {return this->p_str;} + char *get_string () const {return this->p_str;} // Get contents of utl_string. char *get_canonical_rep (void); |