ChangeLogTag: M Basic_Types.h

5 files changed, 19 insertions, 74 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8b6c24926cb..4f418794712 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,13 @@
+Wed Jun 22 18:01:15 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * Basic_Types.h:
+        * CDR_Base.cpp:
+        * CDR_Base.h:
+        * config-win32-mingw.h:
+
+          Reverted all changes made related to support for long double
+          constants in IDL.
+
 Tue Jun 21 18:14:46 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * ace/Basic_Types.h:
diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h
index e92c61bc947..7153552084d 100644
--- a/ACE/ace/Basic_Types.h
+++ b/ACE/ace/Basic_Types.h
@@ -832,19 +832,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 #  endif /* defined (PRIu64) */
 #endif /* ACE_UINT64_FORMAT_SPECIFIER */
 
-#if !defined (ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII)
-#  if defined (ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE) && \
-              (ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE == 1)
-#    if defined (NONNATIVE_LONGDOUBLE)
-#      define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%#24.16G"
-#    else
-#      define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%24.16GL"
-#    endif /* defined (NONNATIVE_LONGDOUBLE) */
-#  else
-#    define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%#24.16LGL"
-#  endif /* ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE */
-#endif /* ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII */
-
 #if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII)
 # if defined (ACE_WIN64)
 #  define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%I64d"
diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp
index 49e9ce02e4c..ca32c9fc503 100644
--- a/ACE/ace/CDR_Base.cpp
+++ b/ACE/ace/CDR_Base.cpp
@@ -685,6 +685,12 @@ ACE_CDR::LongDouble::assign (const ACE_CDR::LongDouble& rhs)
 }
 
 bool
+ACE_CDR::LongDouble::operator== (const ACE_CDR::LongDouble &rhs) const
+{
+  return ACE_OS::memcmp (this->ld, rhs.ld, 16) == 0;
+}
+
+bool
 ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const
 {
   return ACE_OS::memcmp (this->ld, rhs.ld, 16) != 0;
@@ -766,37 +772,6 @@ ACE_CDR::LongDouble::operator ACE_CDR::LongDouble::NativeImpl () const
 
   return ret;
 }
-
-bool
-ACE_CDR::LongDouble::operator== (const ACE_CDR::LongDouble &rhs) const
-{
-  return ACE_OS::memcmp (this->ld, rhs.ld, 16) == 0;
-}
-
-//=================================================================
-
-ACE_CDR::LongDoubleAssign::LongDoubleAssign (void)
-{
-}
-
-ACE_CDR::LongDoubleAssign::LongDoubleAssign (const long double& val)
-{
-  (*this) += (NativeImpl) val;
-}
-
-ACE_CDR::LongDoubleAssign&
-ACE_CDR::LongDoubleAssign::operator= (
-  const ACE_CDR::LongDouble::NativeImpl& rhs)
-{
-  this->assign (rhs);
-  return *this;
-}
-
-ACE_CDR::LongDoubleAssign::operator ACE_CDR::LongDouble (void)
-{
-  return *this;
-}
-
 #endif /* NONNATIVE_LONGDOUBLE */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h
index f2a4b10d51d..d7bd2937be8 100644
--- a/ACE/ace/CDR_Base.h
+++ b/ACE/ace/CDR_Base.h
@@ -291,16 +291,10 @@ public:
        typedef long double      LongDouble;
 #      define   ACE_CDR_LONG_DOUBLE_INITIALIZER 0
 #      define   ACE_CDR_LONG_DOUBLE_ASSIGNMENT(LHS, RHS) LHS = RHS
-
-       // Trivial alternative to the derived class of the same name below,
-       // so the same code will work whether or not a native long double
-       // is used.
-       inline static LongDouble LongDoubleAssign (const LongDouble &ld) {return ld;}
 #    else
 #      define NONNATIVE_LONGDOUBLE
-#      define ACE_CDR_LONG_DOUBLE_INITIALIZER {{0}}
-#      define ACE_CDR_LONG_DOUBLE_ASSIGNMENT(LHS, RHS) LHS.assign (RHS)
-
+#      define   ACE_CDR_LONG_DOUBLE_INITIALIZER {{0}}
+#      define   ACE_CDR_LONG_DOUBLE_ASSIGNMENT(LHS, RHS) LHS.assign (RHS)
        struct ACE_Export LongDouble
        {
        // VxWorks' compiler (gcc 2.96) gets confused by the operator long
@@ -316,7 +310,7 @@ public:
          typedef double NativeImpl;
 #      else
          typedef long double NativeImpl;
-#      endif /* ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE == 1 */
+#      endif /* ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE==1 */
 
          char ld[16];
 
@@ -357,17 +351,6 @@ public:
 
          operator NativeImpl () const;
        };
-
-       struct ACE_Export LongDoubleAssign : LongDouble
-       {
-         LongDoubleAssign (void);
-         explicit LongDoubleAssign (const long double &val);
-
-         LongDoubleAssign& operator= (const LongDouble::NativeImpl& rhs);
-
-         operator LongDouble (void);
-       };
-
 #    endif /* ACE_SIZEOF_LONG_DOUBLE != 16 */
 
   //@}
diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h
index c30956e6d5b..1b20b3fdf61 100644
--- a/ACE/ace/config-win32-mingw.h
+++ b/ACE/ace/config-win32-mingw.h
@@ -92,16 +92,6 @@
 
 #define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d"
 #define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u"
-#define ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII "%24.16G"
-
-// MinGW as supplied doesn't support the long double format
-// in printf out of the box. So for long double constants,
-// generated from IDL, we must print the literal as a double.
-// The directive below will make the argument to printf agree
-// with the format string defined above. It will not affect
-// marshaling (see CDR_Base.h, near the top of the workaround
-// struct LongDouble).
-#define ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE 1
 
 #define ACE_ENDTHREADEX(STATUS)  ::_endthreadex ((DWORD) (STATUS))