ChangeLogTag: Fri Apr 15 07:19:20 2005 Olli Savia <ops@iki.fi>

4 files changed, 36 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index 94fbba9c43d..82f065b68c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,31 +1,39 @@
+Fri Apr 15 07:19:20 2005  Olli Savia  <ops@iki.fi>
+
+        * ace/Handle_Set.cpp:
+        * ace/README:
+        * m4/config_h.m4:
+          Removed references to ACE_HAS_BROKEN_BITSHIFT. It is no longer
+          needed.
+
 Thu Apr 14 17:12:44 2005  Steve Huston  <shuston@riverace.com>
 
-	* configure.ac: Corrected the variable used to tell whether or not
-	  to check for ACE_HAS_XPG4_MULTIBYTE_CHAR. Fixes configure on Solaris.
+        * configure.ac: Corrected the variable used to tell whether or not
+          to check for ACE_HAS_XPG4_MULTIBYTE_CHAR. Fixes configure on Solaris.
 
-	* ace/Service_Config.h: #include "ace/SString.h" instead of
-	  "ace/SStringfwd.h" to make sure everything needed for explicit
-	  template instantiation is present.
+        * ace/Service_Config.h: #include "ace/SString.h" instead of
+          "ace/SStringfwd.h" to make sure everything needed for explicit
+          template instantiation is present.
 
 Thu Apr 14 15:25:31 2005  Steve Huston  <shuston@riverace.com>
 
-	* NEWS: Added a note that the reactor change:
-	  Wed Apr 13 14:34:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
-	  may cause some trouble in programs that dynamically allocate
-	  a reactor implementation then destroy it before the ACE_Reactor
-	  referring to it. This is always bad, but now will cause a crash.
-
-	* examples/Reactor/WFMO_Reactor/run_test.pl: Removed the "require
-	  Process" line - it tried to refer to the one in $ACE_ROOT/bin, which
-	  was removed:
-	  Mon Apr  4 11:20:08 2005  J.T. Conklin  <jtc@acorntoolworks.com>
-
-	* tests/Priority_Reactor_Test.cpp (run_main):
-	* tests/Reactor_Notify_Test.cpp (run_test): Use the ACE_Reactor's
-	  delete_implementation setting to delete any created reactor
-	  implementation instead of using separate auto_ptr objects for the
-	  ACE_Reactor and its implementation. Prevents destruction
-	  order issues if the implementation is destroyed first.
+        * NEWS: Added a note that the reactor change:
+          Wed Apr 13 14:34:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
+          may cause some trouble in programs that dynamically allocate
+          a reactor implementation then destroy it before the ACE_Reactor
+          referring to it. This is always bad, but now will cause a crash.
+
+        * examples/Reactor/WFMO_Reactor/run_test.pl: Removed the "require
+          Process" line - it tried to refer to the one in $ACE_ROOT/bin, which
+          was removed:
+          Mon Apr  4 11:20:08 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tests/Priority_Reactor_Test.cpp (run_main):
+        * tests/Reactor_Notify_Test.cpp (run_test): Use the ACE_Reactor's
+          delete_implementation setting to delete any created reactor
+          implementation instead of using separate auto_ptr objects for the
+          ACE_Reactor and its implementation. Prevents destruction
+          order issues if the implementation is destroyed first.
 
 Thu Apr 14 09:21:14 2005  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/ace/Handle_Set.cpp b/ace/Handle_Set.cpp
index 682867014ee..a24605a5367 100644
--- a/ace/Handle_Set.cpp
+++ b/ace/Handle_Set.cpp
@@ -14,20 +14,13 @@ ACE_RCSID(ace, Handle_Set, "$Id$")
 ACE_ALLOC_HOOK_DEFINE(ACE_Handle_Set)
 
   // ACE_MSB_MASK is only used here.
-# if defined (ACE_HAS_BROKEN_BITSHIFT)
-  // This might not be necessary any more:  it was added prior to the
-  // (fd_mask) cast being added to the version below.  Maybe that cast
-  // will fix the problem on tandems.    Fri Dec 12 1997 David L. Levine
-#   define ACE_MSB_MASK (~(ACE_UINT32 (1) << ACE_UINT32 (NFDBITS - 1)))
-# else
   // This needs to go here to avoid overflow problems on some compilers.
-#   if defined (ACE_WIN32)
-    //  Does ACE_WIN32 have an fd_mask?
-#     define ACE_MSB_MASK (~(1 << (NFDBITS - 1)))
-#   else  /* ! ACE_WIN32 */
-#     define ACE_MSB_MASK (~((fd_mask) 1 << (NFDBITS - 1)))
-#   endif /* ! ACE_WIN32 */
-# endif /* ACE_HAS_BROKEN_BITSHIFT */
+#if defined (ACE_WIN32)
+   //  Does ACE_WIN32 have an fd_mask?
+#  define ACE_MSB_MASK (~(1 << (NFDBITS - 1)))
+#else  /* ! ACE_WIN32 */
+#  define ACE_MSB_MASK (~((fd_mask) 1 << (NFDBITS - 1)))
+#endif /* ! ACE_WIN32 */
 
 #if defined (__BORLANDC__) && !defined (ACE_WIN32)
 // The Borland C++ compiler on Linux also doesn't have fds_bits, but has __fds_bits.
diff --git a/ace/README b/ace/README
index 2fc4a14df34..7674e4e1071 100644
--- a/ace/README
+++ b/ace/README
@@ -225,9 +225,6 @@ ACE_HAS_BROKEN_NAMESPACES               Compiler/platform doesn't
                                         support namespaces (or the
                                         support is not fully
                                         implemented.)
-ACE_HAS_BROKEN_BITSHIFT                 Compiler has integer overflow
-                                        problem with bit-shift
-                                        operations.
 ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS Compiler can't handle const char *
                                         as rvalue in conditional operator.
 ACE_HAS_BROKEN_CONVERSIONS              Compiler can't handle calls
diff --git a/m4/config_h.m4 b/m4/config_h.m4
index 801542e5e47..1df1b095f57 100644
--- a/m4/config_h.m4
+++ b/m4/config_h.m4
@@ -292,9 +292,6 @@ AH_TEMPLATE([ACE_HAS_BROKEN_NAMESPACES],
 [Compiler/platform doesn't support namespaces (or the support is not
 fully implemented.)])
 
-AH_TEMPLATE([ACE_HAS_BROKEN_BITSHIFT],
-[Compiler has integer overflow problem with bit-shift operations.])
-
 AH_TEMPLATE([ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS],
 [Compiler can't handle const char * as rvalue in conditional operator.])