aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@bitrange.com>2002-10-24 23:27:27 +0000
committerHans-Peter Nilsson <hp@gcc.gnu.org>2002-10-24 23:27:27 +0000
commit2068a050ab0a7b4824c8f8dfdfbbce8663766903 (patch)
tree1eef53f7871517c3ca1063bda0250829c2f9813a
parentd0af82b0ce4a0f83f844b927e83853acf904eab4 (diff)
downloadgcc-2068a050ab0a7b4824c8f8dfdfbbce8663766903.zip
gcc-2068a050ab0a7b4824c8f8dfdfbbce8663766903.tar.gz
gcc-2068a050ab0a7b4824c8f8dfdfbbce8663766903.tar.bz2
testsuite_hooks.cc (__set_testsuite_memlimit): Use __typeof__ (r.rlim_cur), not rlim_t in declaration of limit.
* testsuite/testsuite_hooks.cc (__set_testsuite_memlimit): Use __typeof__ (r.rlim_cur), not rlim_t in declaration of limit. From-SVN: r58512
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/testsuite_hooks.cc4
2 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c98a2db..13ffd4e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-24 Hans-Peter Nilsson <hp@bitrange.com>
+
+ * testsuite/testsuite_hooks.cc (__set_testsuite_memlimit): Use
+ __typeof__ (r.rlim_cur), not rlim_t in declaration of limit.
+
2002-10-23 Jakub Jelinek <jakub@redhat.com>
* testsuite/22_locale/num_put_members_char.cc (test01): Swap size
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/testsuite_hooks.cc
index 4e6c831..0af2bd1 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.cc
+++ b/libstdc++-v3/testsuite/testsuite_hooks.cc
@@ -38,7 +38,9 @@ void
__set_testsuite_memlimit(float __size)
{
struct rlimit r;
- rlim_t limit = (rlim_t)(__size * 1048576);
+ // Cater to the absence of rlim_t.
+ __typeof__ (r.rlim_cur) limit
+ = (__typeof__ (r.rlim_cur))(__size * 1048576);
// Heap size, seems to be common.
#if _GLIBCPP_HAVE_MEMLIMIT_DATA