From mboxrd@z Thu Jan  1 00:00:00 1970
From: Greg Galloway <gregg@eoeml.gtri.gatech.edu>
To: egcs@cygnus.com
Subject: egcs-971016/libstc++/stl/hashtable patch (revised)
Date: Fri, 17 Oct 1997 15:05:00 -0000
Message-id: <199710172048.QAA12071@nospokes.gtri.gatech.edu>
X-SW-Source: 1997-10/msg00749.html

Fri Oct 17 11:58:18 EDT 1997  Gregory L. Galloway <gregg@eoeml@gtri.gatech.edu>

	* hashtable.h(__stl_prime_list): Added literal constant suffixes to 
	suppress warnings about integer constant which is too large.
	(new_node): Moved return stmt outside try block to suppress warning.

*** libstdc++/stl/hashtable.h.orig	Fri Oct 17 11:51:14 1997
--- libstdc++/stl/hashtable.h	Fri Oct 17 11:52:42 1997
***************
*** 182,193 ****
  static const int __stl_num_primes = 28;
  static const unsigned long __stl_prime_list[__stl_num_primes] =
  {
!   53,         97,         193,       389,       769,
!   1543,       3079,       6151,      12289,     24593,
!   49157,      98317,      196613,    393241,    786433,
!   1572869,    3145739,    6291469,   12582917,  25165843,
!   50331653,   100663319,  201326611, 402653189, 805306457, 
!   1610612741, 3221225473, 4294967291
  };
  
  inline unsigned long __stl_next_prime(unsigned long n)
--- 182,193 ----
  static const int __stl_num_primes = 28;
  static const unsigned long __stl_prime_list[__stl_num_primes] =
  {
!   53ul,         97ul,         193ul,       389ul,       769ul,
!   1543ul,       3079ul,       6151ul,      12289ul,     24593ul,
!   49157ul,      98317ul,      196613ul,    393241ul,    786433ul,
!   1572869ul,    3145739ul,    6291469ul,   12582917ul,  25165843ul,
!   50331653ul,   100663319ul,  201326611ul, 402653189ul, 805306457ul, 
!   1610612741ul, 3221225473ul, 4294967291ul
  };
  
  inline unsigned long __stl_next_prime(unsigned long n)
***************
*** 526,532 ****
      try {
  #       endif /* __STL_USE_EXCEPTIONS */
        construct(&n->val, obj);
-       return n;
  #       ifdef __STL_USE_EXCEPTIONS
      }
      catch(...) {
--- 526,531 ----
***************
*** 534,539 ****
--- 533,539 ----
        throw;
      }
  #       endif /* __STL_USE_EXCEPTIONS */
+     return n;
    }
    
    void delete_node(node* n)