summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza@objectcomputing.com>2021-11-09 16:39:47 -0600
committerGitHub <noreply@github.com>2021-11-09 16:39:47 -0600
commit481aa86bf7ce43d8e76447c1a36ce8b406dbc704 (patch)
tree744f49cc3cacef953afbe2fecb9467687adbbec1
parentffb84e730475441e9096747e0ff19c8a0c198169 (diff)
parent576421723fad21844f94f2cbf8a55fa43ab1e7bf (diff)
downloadATCD-481aa86bf7ce43d8e76447c1a36ce8b406dbc704.tar.gz
Merge pull request #1718 from iguessthislldo/igtd/const-expr-issue-1713
Fix Warning, Correct Spelling in `TAO/NEWS`
-rw-r--r--TAO/NEWS4
-rw-r--r--TAO/TAO_IDL/ast/ast_expression.cpp5
2 files changed, 2 insertions, 7 deletions
diff --git a/TAO/NEWS b/TAO/NEWS
index 80208dfb747..e96703d09fe 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,8 +1,8 @@
USER VISIBLE CHANGES BETWEEN TAO-3.0.4 and TAO-3.0.5
====================================================
-. TAO_IDL: Fix bug where floating point constant expressions fail to evaulate.
- This bug was introduced in in 3.0.3.
+. TAO_IDL: Fix bug where floating point constant expressions fail to evaluate.
+ This bug was introduced in 3.0.3.
USER VISIBLE CHANGES BETWEEN TAO-3.0.3 and TAO-3.0.4
====================================================
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 0c269cdf569..7249d745843 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -1917,11 +1917,6 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
pd_v1->ev ()->u.oval, pd_v2->ev ()->u.oval, retval->u.oval);
break;
- case EV_bool:
- success = do_eval_mod_op<ACE_CDR::Boolean> (
- pd_v1->ev ()->u.bval, pd_v2->ev ()->u.bval, retval->u.bval);
- break;
-
default:
break;
}