diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp')
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp index 7f682732403..091a149ef13 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp @@ -16,7 +16,7 @@ be_visitor_constant_ch::be_visitor_constant_ch (be_visitor_context *ctx) { } -be_visitor_constant_ch::~be_visitor_constant_ch (void) +be_visitor_constant_ch::~be_visitor_constant_ch () { } @@ -43,7 +43,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node) AST_Expression::ExprType etype = node->et (); AST_Decl::NodeType snt = node->defined_in ()->scope_node_type (); - if (tdef != 0) + if (tdef != nullptr) { nt = tdef->node_type (); be_typedef *td = dynamic_cast<be_typedef*> (tdef); @@ -109,7 +109,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node) } // If this is true, can't generate inline constants. - bool forbidden_in_class = (snt != AST_Decl::NT_root + bool const forbidden_in_class = (snt != AST_Decl::NT_root && snt != AST_Decl::NT_module && (etype == AST_Expression::EV_string || etype == AST_Expression::EV_wstring |