From e9fcbff699a534f5ed7d5c680247c40517a8ce1f Mon Sep 17 00:00:00 2001 From: parsons Date: Fri, 3 Jun 2011 18:51:07 +0000 Subject: ChangeLogTag: Fri Jun 3 18:46:50 UTC 2011 Jeff Parsons --- ACE/ChangeLog | 9 +++++++++ ACE/ace/CDR_Base.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ACE/ChangeLog b/ACE/ChangeLog index fcd3a07755c..17484cf3536 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Fri Jun 3 18:46:50 UTC 2011 Jeff Parsons + + * ace/CDR_Base.h: + + Made the ACE_CDR::LongDouble struct constructor from native + long double explicit, which eliminates compiler ambiguities + when the struct's '==' and '!=' operators are used with + a native long double rhs. + Wed Jun 1 19:30:44 UTC 2011 Jeff Parsons * ace/CDR_Base.cpp: diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h index be48a17e7db..61285e0c69a 100644 --- a/ACE/ace/CDR_Base.h +++ b/ACE/ace/CDR_Base.h @@ -316,7 +316,7 @@ public: char ld[16]; LongDouble (void); - LongDouble (const long double &val); + explicit LongDouble (const long double &val); LongDouble& assign (const NativeImpl& rhs); LongDouble& assign (const LongDouble& rhs); -- cgit v1.2.1