Map ACE_CDR LongLong to ACE_INT64, all platforms for which we needed an emulation have been deprecated in the past.

    * ACE/ace/CDR_Base.cpp:
    * ACE/ace/CDR_Base.h:
    * ACE/ace/CDR_Size.h:
    * ACE/ace/README:
    * ACE/ace/config-kfreebsd.h:
    * ACE/ace/config-qnx.h:
    * TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp:
    * TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp:
    * TAO/TAO_IDL/be/be_visitor_attr_init.cpp:
    * TAO/TAO_IDL/be/be_visitor_null_return_value.cpp:
    * TAO/TAO_IDL/fe/idl.yy.cpp:
    * TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp:
    * TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp:
    * TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp:

1 files changed, 1 insertions, 45 deletions

diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h
index 71f5b328ce2..1a8deb3fb93 100644
--- a/ACE/ace/CDR_Base.h
+++ b/ACE/ace/CDR_Base.h
@@ -205,53 +205,9 @@ public:
   typedef ACE_UINT16 UShort;
   typedef ACE_INT32 Long;
   typedef ACE_UINT32 ULong;
+  typedef ACE_INT64 LongLong;
   typedef ACE_UINT64 ULongLong;
 
-#   if (defined (_MSC_VER)) || (defined (__BORLANDC__))
-      typedef __int64 LongLong;
-#   elif ACE_SIZEOF_LONG == 8
-      typedef long LongLong;
-#   elif defined(__TANDEM)
-      typedef long long LongLong;
-#   elif ACE_SIZEOF_LONG_LONG == 8
-#     if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T)
-              // sun #defines   u_longlong_t, maybe other platforms do also.
-              // Use it, at least with g++, so that its -pedantic doesn't
-              // complain about no ANSI C++ long long.
-              typedef   longlong_t LongLong;
-#     else
-              typedef   long long LongLong;
-#     endif /* sun */
-#   else  /* no native 64 bit integer type */
-#     define NONNATIVE_LONGLONG
-      struct ACE_Export LongLong
-        {
-#     if defined (ACE_BIG_ENDIAN)
-          ACE_CDR::Long h;
-          ACE_CDR::Long l;
-#     else
-          ACE_CDR::Long l;
-          ACE_CDR::Long h;
-#     endif /* ! ACE_BIG_ENDIAN */
-
-          /**
-           * @name Overloaded Relation Operators.
-           *
-           * The canonical comparison operators.
-           */
-          //@{
-          bool operator== (const LongLong &rhs) const;
-          bool operator!= (const LongLong &rhs) const;
-          //@}
-        };
-#   endif /* no native 64 bit integer type */
-
-#   if defined (NONNATIVE_LONGLONG)
-#     define ACE_CDR_LONGLONG_INITIALIZER {0,0}
-#   else
-#     define ACE_CDR_LONGLONG_INITIALIZER 0
-#   endif /* NONNATIVE_LONGLONG */
-
 #   if ACE_SIZEOF_FLOAT == 4
       typedef float Float;
 #   else  /* ACE_SIZEOF_FLOAT != 4 */