diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/bool-array.cc | 4 | ||||
| -rw-r--r-- | src/bool-array.h | 14 | ||||
| -rw-r--r-- | src/bool-array.icc | 2 | ||||
| -rw-r--r-- | src/gen-perf.cc | 6 |
5 files changed, 15 insertions, 17 deletions
@@ -1,5 +1,11 @@ 2002-10-03 Bruno Haible <bruno@clisp.org> + * src/bool-array.h (STORAGE_TYPE): Remove type. + Use 'unsigned int' instead of STORAGE_TYPE. + * src/bool-array.cc: Likewise. + * src/bool-array.icc: Likewise. + * src/gen-perf.cc: Likewise. + * src/new.cc: Remove file. * src/Makefile.in (OBJECTS): Remove new.o. (new.o): Remove rule. diff --git a/src/bool-array.cc b/src/bool-array.cc index fc11e7d..83e15b0 100644 --- a/src/bool-array.cc +++ b/src/bool-array.cc @@ -24,8 +24,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ #include <string.h> #include "options.h" -STORAGE_TYPE * Bool_Array::storage_array; -STORAGE_TYPE Bool_Array::iteration_number; +unsigned int * Bool_Array::storage_array; +unsigned int Bool_Array::iteration_number; unsigned int Bool_Array::size; /* Prints out debugging diagnostics. */ diff --git a/src/bool-array.h b/src/bool-array.h index 4d08df1..c91e08e 100644 --- a/src/bool-array.h +++ b/src/bool-array.h @@ -27,25 +27,17 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef bool_array_h #define bool_array_h 1 -#ifdef LO_CAL -/* If we are on a memory diet then we'll only make these use a limited - amount of storage space. */ -typedef unsigned short STORAGE_TYPE; -#else -typedef unsigned int STORAGE_TYPE; -#endif - class Bool_Array { private: - static STORAGE_TYPE *storage_array; /* Initialization of the index space. */ - static STORAGE_TYPE iteration_number; /* Keep track of the current iteration. */ + static unsigned int *storage_array; /* Initialization of the index space. */ + static unsigned int iteration_number; /* Keep track of the current iteration. */ static unsigned int size; /* Keep track of array size. */ public: Bool_Array (void); ~Bool_Array (void); - static void init (STORAGE_TYPE *buffer, unsigned int s); + static void init (unsigned int *buffer, unsigned int s); static int find (int hash_value); static void reset (void); }; diff --git a/src/bool-array.icc b/src/bool-array.icc index 6f4474d..6c5859e 100644 --- a/src/bool-array.icc +++ b/src/bool-array.icc @@ -32,7 +32,7 @@ Bool_Array::Bool_Array (void) } INLINE void -Bool_Array::init (STORAGE_TYPE *buffer, unsigned int s) +Bool_Array::init (unsigned int *buffer, unsigned int s) { size = s; iteration_number = 1; diff --git a/src/gen-perf.cc b/src/gen-perf.cc index d60ea64..2064128 100644 --- a/src/gen-perf.cc +++ b/src/gen-perf.cc @@ -275,11 +275,11 @@ int Gen_Perf::operator() (void) { #if LARGE_STACK_ARRAYS - STORAGE_TYPE buffer[max_hash_value + 1]; + unsigned int buffer[max_hash_value + 1]; #else // Note: we don't use new, because that invokes a custom operator new. - STORAGE_TYPE *buffer - = (STORAGE_TYPE*) malloc (sizeof(STORAGE_TYPE) * (max_hash_value + 1)); + unsigned int *buffer + = (unsigned int*) malloc (sizeof(unsigned int) * (max_hash_value + 1)); if (buffer == NULL) abort (); #endif |