ChangeLogTag: Fri Jun 3 18:54:59 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>

2 files changed, 26 insertions, 1 deletions

diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
index e90b3cd1162..252777f91c9 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -63,9 +63,14 @@ namespace TAO
   #endif
         break;
 #endif
+#if !defined (NONNATIVE_LONGDOUBLE)
+      // Portable impl of non-native long double requires a struct
+      // with constructors, which can't be a C++ union member,
+      // at least until C++0x is adopted.
       case CORBA::tk_longdouble:
         this->u_.ld = *static_cast<CORBA::LongDouble *> (value);
         break;
+#endif
       case CORBA::tk_wchar:
         this->u_.wc = *static_cast<CORBA::WChar *> (value);
         break;
@@ -198,8 +203,13 @@ namespace TAO
       case CORBA::tk_ulonglong:
         return cdr << this->u_.ull;
 #endif
+#if !defined (NONNATIVE_LONGDOUBLE)
+      // Portable impl of non-native long double requires a struct
+      // with constructors, which can't be a C++ union member,
+      // at least until C++0x is adopted.
       case CORBA::tk_longdouble:
         return cdr << this->u_.ld;
+#endif
       case CORBA::tk_wchar:
         return cdr << CORBA::Any::from_wchar (this->u_.wc);
       default:
@@ -245,8 +255,13 @@ namespace TAO
       case CORBA::tk_ulonglong:
         return cdr >> this->u_.ull;
 #endif
+#if !defined (NONNATIVE_LONGDOUBLE)
+      // Portable impl of non-native long double requires a struct
+      // with constructors, which can't be a C++ union member,
+      // at least until C++0x is adopted.
       case CORBA::tk_longdouble:
         return cdr >> this->u_.ld;
+#endif
       case CORBA::tk_wchar:
         return cdr >> CORBA::Any::to_wchar (this->u_.wc);
       default:
@@ -283,7 +298,7 @@ namespace TAO
         break;
       case CORBA::tk_longdouble:
         {
-          CORBA::LongDouble tmp = ACE_CDR_LONG_DOUBLE_INITIALIZER;
+          CORBA::LongDouble tmp (0.0L);
           ACE_NEW_RETURN (retval,
                           TAO::Any_Basic_Impl (tc, &tmp),
                           0);
@@ -360,9 +375,14 @@ namespace TAO
         *static_cast<CORBA::LongLong *> (dest) = src->u_.ull;
   #endif
 #endif
+#if !defined (NONNATIVE_LONGDOUBLE)
+      // Portable impl of non-native long double requires a struct
+      // with constructors, which can't be a C++ union member,
+      // at least until C++0x is adopted.
       case CORBA::tk_longdouble:
         *static_cast<CORBA::LongDouble *> (dest) = src->u_.ld;
         break;
+#endif
       case CORBA::tk_wchar:
         *static_cast<CORBA::WChar *> (dest) = src->u_.wc;
         break;
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
index 848056f6ab4..c0482ec5e6c 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
@@ -88,7 +88,12 @@ namespace TAO
       // Use signed long long as the container.
       CORBA::LongLong ull;
 #endif
+#if !defined (NONNATIVE_LONGDOUBLE)
+      // Portable impl of non-native long double requires a struct
+      // with constructors, which can't be a C++ union member,
+      // at least until C++0x is adopted.
       CORBA::LongDouble ld;
+#endif
       CORBA::WChar wc;
     }u_;
   };