stl_alloc.h (default_alloc_template::_S_free_list): Don't qualify _NFREELISTS.

	* stl_alloc.h (default_alloc_template::_S_free_list): Don't
	qualify _NFREELISTS.

From-SVN: r23491

diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog
index 848f74b61ec1bc29a0a6338c29781ac1d1f34a39..e7ef0651370109b15c65be71a8d9428171d80a67 100644 (file)
--- a/libstdc++/stl/ChangeLog
+++ b/libstdc++/stl/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-01  Mark Mitchell  <mark@markmitchell.com>
+
+       * stl_alloc.h (default_alloc_template::_S_free_list): Don't
+       qualify _NFREELISTS.
+
 1998-10-11  Mark Mitchell  <mark@markmitchell.com>
 
        * stl_config.h (__SGI_STL_USE_AUTO_PTR_CONVERSIONS): Define.

diff --git a/libstdc++/stl/stl_alloc.h b/libstdc++/stl/stl_alloc.h
index 3a773b4bbc0c32fa33967e0dddf23591628ad562..cc3b681732436940284445e6d881a0406fbeff6d 100644 (file)
--- a/libstdc++/stl/stl_alloc.h
+++ b/libstdc++/stl/stl_alloc.h
@@ -679,11 +679,7 @@ size_t __default_alloc_template<__threads, __inst>::_S_heap_size = 0;
 template <bool __threads, int __inst>
 __default_alloc_template<__threads, __inst>::_Obj* __VOLATILE
 __default_alloc_template<__threads, __inst> ::_S_free_list[
-# ifdef __SUNPRO_CC
     _NFREELISTS
-# else
-    __default_alloc_template<__threads, __inst>::_NFREELISTS
-# endif
 ] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
 // The 16 zeros are necessary to make version 4.1 of the SunPro
 // compiler happy.  Otherwise it appears to allocate too little