ChangelogTag: Sat Jul 12 11:08:41 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

2 files changed, 17 insertions, 2 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2fec89d1201..9f1b18e9bd8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Sat Jul 12 11:08:41 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_constant.cpp:
+
+	  To a previous fix to prevent a truncation error on MSVC when
+	  assigning a float constant from a literal in the constructor, added
+	  an additional check to make sure we are not assigning from
+	  another float constant, or from a literal decimal coerced to a
+	  float. Thanks to Erik Johannes <erik_posting_email@yahoo.com> for
+	  reporting the problem assigning one float constant to another.
+
 Fri Jul 11 18:41:41 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Any.cpp:
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index c6e55bf1f08..029bc77859b 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -164,8 +164,12 @@ AST_Constant::AST_Constant (AST_Expression::ExprType t,
     ifr_added_ (0)
 {
   // Avoids a truncation warning on MSVC when assigning a decimal
-  // literal to a float constant.
-  if (t == AST_Expression::EV_float)
+  // literal to a float constant. Must also check that the input
+  // expression is of type double (indicates that we are being
+  // assigned from a literal). If v is of type float, it may be
+  // a constant-to-constant assignment - in any case the danger
+  // of truncation would not apply.
+  if (t == AST_Expression::EV_float && v->ev ()->et == AST_Expression::EV_double)
     {
       AST_Expression::AST_ExprValue *ev = 
         this->pd_constant_value->ev ();