aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2010-08-31 17:24:39 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2010-08-31 17:24:39 +0000
commitba6a601c1a8d8dcf6dc5574a96d0f4d53b0ef8fe (patch)
tree511972779d72e806f0ce16507549faedc5da1c5e
parent9c6a2bee91dffed0edd40812552a2e5473e5fbb3 (diff)
downloadgcc-ba6a601c1a8d8dcf6dc5574a96d0f4d53b0ef8fe.zip
gcc-ba6a601c1a8d8dcf6dc5574a96d0f4d53b0ef8fe.tar.gz
gcc-ba6a601c1a8d8dcf6dc5574a96d0f4d53b0ef8fe.tar.bz2
remove_freed.cc: Fix test01 return type to void.
2010-08-31 Paolo Carlini <paolo.carlini@oracle.com> * testsuite/23_containers/forward_list/operations/remove_freed.cc: Fix test01 return type to void. * testsuite/util/exception/safety.h: Avoid -Wall -m32 warnings. * testsuite/util/replacement_memory_operators.h: Likewise. From-SVN: r163684
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_freed.cc2
-rw-r--r--libstdc++-v3/testsuite/util/exception/safety.h6
-rw-r--r--libstdc++-v3/testsuite/util/replacement_memory_operators.h2
4 files changed, 12 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index af27275..1f435ff 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-31 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * testsuite/23_containers/forward_list/operations/remove_freed.cc:
+ Fix test01 return type to void.
+ * testsuite/util/exception/safety.h: Avoid -Wall -m32 warnings.
+ * testsuite/util/replacement_memory_operators.h: Likewise.
+
2010-08-29 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/23_containers/bitset/invalidation: Move...
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_freed.cc b/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_freed.cc
index c1900c1..5b959209 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_freed.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/operations/remove_freed.cc
@@ -25,7 +25,7 @@
// 23.3.3.5 forward_list operations [forwardlist.ops]
// Used to cause many Valgrind errors: LWG 526-type situation.
-int test01()
+void test01()
{
bool test __attribute__((unused)) = true;
diff --git a/libstdc++-v3/testsuite/util/exception/safety.h b/libstdc++-v3/testsuite/util/exception/safety.h
index 046eab9..bc96505 100644
--- a/libstdc++-v3/testsuite/util/exception/safety.h
+++ b/libstdc++-v3/testsuite/util/exception/safety.h
@@ -52,13 +52,13 @@ namespace __gnu_test
__s += "\n";
__s += "random number generated is: ";
char buf[40];
- __builtin_sprintf(buf, "%lu", random);
+ __builtin_sprintf(buf, "%lu", (unsigned long)random);
__s += buf;
__s += " on range [";
- __builtin_sprintf(buf, "%lu", distribution.min());
+ __builtin_sprintf(buf, "%lu", (unsigned long)distribution.min());
__s += buf;
__s += ", ";
- __builtin_sprintf(buf, "%lu", distribution.max());
+ __builtin_sprintf(buf, "%lu", (unsigned long)distribution.max());
__s += buf;
__s += "]\n";
std::__throw_out_of_range(__s.c_str());
diff --git a/libstdc++-v3/testsuite/util/replacement_memory_operators.h b/libstdc++-v3/testsuite/util/replacement_memory_operators.h
index 895ccfe..b7d3a3b 100644
--- a/libstdc++-v3/testsuite/util/replacement_memory_operators.h
+++ b/libstdc++-v3/testsuite/util/replacement_memory_operators.h
@@ -108,6 +108,6 @@ void operator delete(void* p) throw()
if (count == 0)
std::printf("All memory released \n");
else
- std::printf("%lu allocations to be released \n", count);
+ std::printf("%lu allocations to be released \n", (unsigned long)count);
}
}