diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-06-09 17:30:43 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-06-09 17:30:43 +0000 |
| commit | 3727d301ebe4c5bac0e7b96be7af8b6eead72230 (patch) | |
| tree | 753b62c06f14a57faafcb3a25149a7db8688c000 | |
| parent | b71df1dfaab0802871534f2c28f37d1ec111c669 (diff) | |
| download | ATCD-3727d301ebe4c5bac0e7b96be7af8b6eead72230.tar.gz | |
ChangeLogTag: Thu Jun 9 17:28:25 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9495a8903c8..35d4a0f8f6b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Jun 9 17:28:25 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_constant/constant_ch.cpp: + * TAO_IDL/be/be_visitor_constant/constant_cs.cpp: + + Changed generated code to always use a constructor with an + ACE_CDR::LongDoubleAssign argument for long double constants. + Thu Jun 9 07:05:59 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp: 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 2f2380a6680..0e7ae60c80b 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp @@ -126,7 +126,6 @@ be_visitor_constant_ch::visit_constant (be_constant *node) if (!node->is_nested () || (be_global->gen_inline_constants () && !forbidden_in_class)) { -#if defined (NONNATIVE_LONGDOUBLE) if (etype == AST_Expression::EV_longdouble) { *os << " (" << be_idt_nl @@ -137,9 +136,6 @@ be_visitor_constant_ch::visit_constant (be_constant *node) { *os << " = " << node->constant_value (); } -#else - *os << " = " << node->constant_value (); -#endif // defined (NONNATIVE_LONGDOUBLE) } *os << ";"; diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp index 57ca1427976..6d4ceca7677 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp @@ -85,7 +85,6 @@ be_visitor_constant_cs::visit_constant (be_constant *node) { // For those constants not defined in the outermost scope, // or in a module, they get assigned to their values in the source file. -#if defined (NONNATIVE_LONGDOUBLE) if (etype == AST_Expression::EV_longdouble) { *os << " (" << be_idt_nl @@ -96,9 +95,6 @@ be_visitor_constant_cs::visit_constant (be_constant *node) { *os << " = " << node->constant_value (); } -#else - *os << " = " << node->constant_value (); -#endif // defined (NONNATIVE_LONGDOUBLE) } *os << ";"; |