diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-12-02 19:09:15 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-12-02 19:09:15 -0600 |
| commit | 12f999aa008be447f4a505eeeb184d03af6630cb (patch) | |
| tree | 9551a16caf65fe1990c8d1051bec602cae42bcd3 | |
| parent | 35a0a8f64120cf179d589aec9c7919a3d0de51e9 (diff) | |
| download | ATCD-12f999aa008be447f4a505eeeb184d03af6630cb.tar.gz | |
Changes for Codacy
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_decl.cpp | 3 | ||||
| -rw-r--r-- | TAO/tests/IDLv4/annotations/be_init.cpp | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index e12813d44f0..fcbd3de24ab 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -1659,8 +1659,7 @@ AST_Decl::builtin () const bool AST_Decl::should_be_dumped () const { - bool is_builtin = builtin (); - return !is_builtin || (is_builtin && idl_global->dump_builtins_); + return !builtin () || idl_global->dump_builtins_; } AST_Annotation_Appls & diff --git a/TAO/tests/IDLv4/annotations/be_init.cpp b/TAO/tests/IDLv4/annotations/be_init.cpp index 81b4435ac12..99d59a827a8 100644 --- a/TAO/tests/IDLv4/annotations/be_init.cpp +++ b/TAO/tests/IDLv4/annotations/be_init.cpp @@ -62,7 +62,7 @@ public: int error_count_; UTL_Error::ErrorCode last_error_, last_warning_; - Annotation_Test (const char *name) + explicit Annotation_Test (const char *name) : name_ (name), idl_ (0), failed_ (false), @@ -523,10 +523,9 @@ BE_post_init (char *[], long) t.assert_annotation_member_count (test_annotation_1, 0); } catch (Failed &f) {} - AST_Annotation_Decl *test_annotation_2 = 0; try { Annotation_Test t("Annotation Declaration with Members"); - test_annotation_2 = t.run ( + AST_Annotation_Decl *test_annotation_2 = t.run ( "@annotation test_annotation_2 {\n" " short short_value;\n" " char char_value;\n" @@ -557,10 +556,9 @@ BE_post_init (char *[], long) t.assert_annotation_member_no_value (boolean_value); } catch (Failed &f) {} - AST_Annotation_Decl *test_annotation_3 = 0; try { Annotation_Test t("Annotation Declaration with Defaulted Members"); - test_annotation_3 = t.run ( + AST_Annotation_Decl *test_annotation_3 = t.run ( "@annotation test_annotation_3 {\n" " short short_value default 1;\n" " char char_value default '&';\n" |