Tue May 15 18:16:09 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/ACE.inl:
        * ace/Atomic_Op_T.h:
        * ace/Basic_Types.h:
        * ace/Basic_Types.inl:
        * ace/Basic_Types.cpp:
        * ace/CDR_Base.h:
        * ace/Functor.h:
        * ace/Functor.inl:
        * ace/Handle_Set.cpp:
        * ace/High_Res_Timer.cpp:
        * ace/Log_Msg.cpp:
        * ace/Numeric_Limits.h:
        * ace/OS_NS_Thread.inl:
        * ace/OS_NS_Thread.cpp:
        * ace/OS_NS_stdlib.inl:
        * ace/OS_NS_sys_select.inl:
        * ace/OS_NS_sys_wait.inl:
        * ace/OS_NS_time.h:
        * ace/OS_NS_time.inl:
        * ace/OS_NS_unistd.inl:
        * ace/Profile_Timer.cpp:
        * ace/Sched_Params.cpp:
        * ace/Stats.cpp:
        * ace/Task.cpp:
        * ace/Throughput_Stats.cpp:
        * ace/Time_Value.h:
        * ace/Time_Value.inl:
        * ace/Truncate.h:
        * ace/UUID.cpp:
        * ace/os_include/os_pthread.h:
        * performance-tests/Server_Concurrency/Latency_Stats.h:
        * performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp:
        * performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp:
        * performance-tests/UDP/udp_test.cpp:
        * tests/Atomic_Op_Test.cpp:
        * tests/Basic_Types_Test.cpp:
        * tests/CDR_Array_Test.cpp:
          Removed support for Tandem NSK. That was the last platform that
          needed the emulated versions of ACE_INT64 and ACE_UINT64, that
          emulation has now been removed

        * ace/config-tandem-nsk-mips-v2.h:
        * ace/config-tandem-nsk-mips-v3.h:
          Removed these files.

2 files changed, 0 insertions, 4 deletions

diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index 66045521d96..0d776c34fbf 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -102,14 +102,12 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc)
     case CORBA::tk_ulong:
       this->any_ <<= static_cast<CORBA::ULong> (0);
       break;
-#if !defined (ACE_LACKS_LONGLONG_T)
     case CORBA::tk_longlong:
       this->any_ <<= static_cast<CORBA::LongLong> (0);
       break;
     case CORBA::tk_ulonglong:
       this->any_ <<= static_cast<CORBA::ULongLong> (0);
       break;
-#endif /* ACE_LACKS_LONGLONG_T */
     case CORBA::tk_boolean:
       this->any_ <<= CORBA::Any::from_boolean (0);
       break;
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 2916277ea96..9f5ced312f4 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -924,7 +924,6 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
         return my_val == other_val;
       }
 // For platforms without native 64-bit ints.
-#if !defined (ACE_LACKS_LONGLONG_T)
     case CORBA::tk_longlong:
       {
         CORBA::LongLong my_val;
@@ -933,7 +932,6 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
         other_any >>= other_val;
         return my_val == other_val;
       }
-#endif /* ACE_LACKS_LONGLONG_T */
     case CORBA::tk_ulonglong:
       {
         CORBA::ULongLong my_val;