diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8bb77955808..9b3a21870b1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-30  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* include/ext/pb_assoc/detail/hash_fn/mask_based_range_hashing.hpp
+	(PB_ASSOC_CLASS_C_DEC::s_highest_bit_1): Cast constant 1 to target
+	type before shifting.
+
 2005-06-29  Paolo Carlini  <pcarlini@suse.de>
 	    
 	PR libstdc++/21244 (cont^2)
diff --git a/libstdc++-v3/include/ext/pb_assoc/detail/hash_fn/mask_based_range_hashing.hpp b/libstdc++-v3/include/ext/pb_assoc/detail/hash_fn/mask_based_range_hashing.hpp
index 1a731ed298d..792c1d2d632 100644
--- a/libstdc++-v3/include/ext/pb_assoc/detail/hash_fn/mask_based_range_hashing.hpp
+++ b/libstdc++-v3/include/ext/pb_assoc/detail/hash_fn/mask_based_range_hashing.hpp
@@ -88,8 +88,10 @@ namespace pb_assoc
     sizeof(typename PB_ASSOC_CLASS_C_DEC::size_type) << 3;
 
     PB_ASSOC_CLASS_T_DEC
-    const typename PB_ASSOC_CLASS_C_DEC::size_type PB_ASSOC_CLASS_C_DEC::s_highest_bit_1 =
-    1 << (s_num_bits_in_size_type - 1);
+    const typename PB_ASSOC_CLASS_C_DEC::size_type
+    PB_ASSOC_CLASS_C_DEC::s_highest_bit_1 =
+    (typename PB_ASSOC_CLASS_C_DEC::size_type) 1
+      << (s_num_bits_in_size_type - 1);
 
     PB_ASSOC_CLASS_T_DEC
     void