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.

1 files changed, 0 insertions, 44 deletions

diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp
index b99282bb7e8..cc2d9b10af7 100644
--- a/ACE/ace/Handle_Set.cpp
+++ b/ACE/ace/Handle_Set.cpp
@@ -224,24 +224,11 @@ ACE_Handle_Set::set_max (ACE_HANDLE current_max)
            maskp[i] == 0;
            i--)
         continue;
-#if defined (ACE_TANDEM_NSK_BIT_ORDER)
-      // bits are in reverse order, MSB (sign bit) = bit 0.
-      this->max_handle_ = ACE_MULT_BY_WORDSIZE (i);
-      for (fd_mask val = maskp[i];
-           (val & ACE_MSB_MASK) != 0;
-           val = (val << 1))
-        ++this->max_handle_;
-#elif 1 /* !defined(ACE_HAS_BIG_FD_SET) */
       this->max_handle_ = ACE_MULT_BY_WORDSIZE (i);
       for (fd_mask val = maskp[i];
            (val & ~1) != 0; // This obscure code is needed since "bit 0" is in location 1...
            val = (val >> 1) & ACE_MSB_MASK)
         ++this->max_handle_;
-#else
-      register u_long val = this->mask_.fds_bits[i];
-      this->max_handle_ = ACE_MULT_BY_WORDSIZE (i)
-        + ACE_Handle_Set::bitpos(val & ~(val - 1));
-#endif /* 1 */
     }
 
   // Do some sanity checking...
@@ -310,12 +297,7 @@ ACE_Handle_Set_Iterator::operator () (void)
       // Increment the iterator and advance to the next bit in this
       // word.
       this->handle_index_++;
-#if defined (ACE_TANDEM_NSK_BIT_ORDER)
-      // bits are in reverse order, MSB (sign bit) = bit 0.
-      this->word_val_ = (this->word_val_ << 1);
-#  else
       this->word_val_ = (this->word_val_ >> 1) & ACE_MSB_MASK;
-#  endif /* ACE_TANDEM_NSK_BIT_ORDER */
 
       // If we've examined all the bits in this word, we'll go onto
       // the next word.
@@ -351,19 +333,10 @@ ACE_Handle_Set_Iterator::operator () (void)
       // bit enabled, keeping track of which <handle_index> this
       // represents (this information is used by subsequent calls to
       // <operator()>).
-
-#if defined (ACE_TANDEM_NSK_BIT_ORDER)
-      // bits are in reverse order, MSB (sign bit) = bit 0.
-      for (;
-           this->word_val_ > 0;
-           this->word_val_ = (this->word_val_ << 1))
-        this->handle_index_++;
-#  else
       for (;
            ACE_BIT_DISABLED (this->word_val_, 1);
            this->handle_index_++)
         this->word_val_ = (this->word_val_ >> 1) & ACE_MSB_MASK;
-#  endif /* ACE_TANDEM_NSK_BIT_ORDER */
 
       return result;
     }
@@ -465,19 +438,11 @@ ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs)
     // Loop until we get <word_val_> to have its least significant bit
     // enabled, keeping track of which <handle_index> this represents
     // (this information is used by <operator()>).
-#if defined (ACE_TANDEM_NSK_BIT_ORDER)
-    // bits are in reverse order, MSB (sign bit) = bit 0.
-    for (this->word_val_ = maskp[this->word_num_];
-         this->word_val_ > 0;
-         this->word_val_ = (this->word_val_ << 1))
-      this->handle_index_++;
-#  else
     for (this->word_val_ = maskp[this->word_num_];
          ACE_BIT_DISABLED (this->word_val_, 1)
            && this->handle_index_ < maxhandlep1;
          this->handle_index_++)
       this->word_val_ = (this->word_val_ >> 1) & ACE_MSB_MASK;
-#  endif /* ACE_TANDEM_NSK_BIT_ORDER */
 #elif !defined (ACE_WIN32) && defined (ACE_HAS_BIG_FD_SET)
     if (this->word_max_==0)
       {
@@ -493,7 +458,6 @@ ACE_Handle_Set_Iterator::ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs)
 #endif /* !ACE_WIN32 && !ACE_HAS_BIG_FD_SET */
 }
 
-
 void
 ACE_Handle_Set_Iterator::reset_state (void)
 {
@@ -533,19 +497,11 @@ ACE_Handle_Set_Iterator::reset_state (void)
     // Loop until we get <word_val_> to have its least significant bit
     // enabled, keeping track of which <handle_index> this represents
     // (this information is used by <operator()>).
-#if defined (ACE_TANDEM_NSK_BIT_ORDER)
-    // bits are in reverse order, MSB (sign bit) = bit 0.
-    for (this->word_val_ = maskp[this->word_num_];
-         this->word_val_ > 0;
-         this->word_val_ = (this->word_val_ << 1))
-      this->handle_index_++;
-#  else
     for (this->word_val_ = maskp[this->word_num_];
          ACE_BIT_DISABLED (this->word_val_, 1)
            && this->handle_index_ < maxhandlep1;
          this->handle_index_++)
       this->word_val_ = (this->word_val_ >> 1) & ACE_MSB_MASK;
-#  endif /* ACE_TANDEM_NSK_BIT_ORDER */
 #elif !defined (ACE_WIN32) && defined (ACE_HAS_BIG_FD_SET)
     if (this->word_max_==0)
       {