summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-04-30 17:17:26 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-04-30 17:17:26 +0200
commitf968d5916066fad70d5fa8c6c30b5d9a7e573a8d (patch)
tree287ef79750fdc6c8e4904ecdf8b68f7ff900afda
parent158c653cd69fc21eebf39b03e779d80d865bfeb9 (diff)
parent61cf0ceadf1e061910d002ae3d3d6b4aa01099b4 (diff)
downloadATCD-f968d5916066fad70d5fa8c6c30b5d9a7e573a8d.tar.gz
Merge branch 'master' into jwi-hashoverride
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
index 4827c027ba9..6cd6515a881 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
@@ -134,7 +134,7 @@ be_visitor_operation_upcall_command_ss::visit (
<< "}" << be_nl_2;
// Generate execute() method.
- os << "virtual void execute ()" << be_nl
+ os << "void execute () override" << be_nl
<< "{" << be_idt_nl;
if (!node->void_return_type ())