From 816d7b53047bca81c226990bc9248d59d80d4b8b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Sep 2016 21:32:03 -0600 Subject: [PATCH] Change selttest.c to use use std::vector This patch changes selftest.c to use std::vector rather than VEC. I think this is a small net plus. 2016-10-12 Tom Tromey * selftest.c: Include , not "vec.h". (self_test_function_ptr): Remove. (tests): Now a std::vector. (register_self_test, run_self_tests): Update. --- gdb/ChangeLog | 7 +++++++ gdb/selftest.c | 20 +++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2a9352a8e04..75076488282 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2016-10-12 Tom Tromey + + * selftest.c: Include , not "vec.h". + (self_test_function_ptr): Remove. + (tests): Now a std::vector. + (register_self_test, run_self_tests): Update. + 2016-10-13 Pedro Alves Tom Tromey diff --git a/gdb/selftest.c b/gdb/selftest.c index c63c06d7f98..110b9e50aca 100644 --- a/gdb/selftest.c +++ b/gdb/selftest.c @@ -18,22 +18,18 @@ #include "defs.h" #include "selftest.h" -#include "vec.h" - -typedef self_test_function *self_test_function_ptr; - -DEF_VEC_P (self_test_function_ptr); +#include /* All the tests that have been registered. */ -static VEC (self_test_function_ptr) *tests; +static std::vector tests; /* See selftest.h. */ void register_self_test (self_test_function *function) { - VEC_safe_push (self_test_function_ptr, tests, function); + tests.push_back (function); } /* See selftest.h. */ @@ -41,17 +37,15 @@ register_self_test (self_test_function *function) void run_self_tests (void) { - int i; - self_test_function_ptr func; int failed = 0; - for (i = 0; VEC_iterate (self_test_function_ptr, tests, i, func); ++i) + for (int i = 0; i < tests.size (); ++i) { QUIT; TRY { - (*func) (); + tests[i] (); } CATCH (ex, RETURN_MASK_ERROR) { @@ -62,6 +56,6 @@ run_self_tests (void) END_CATCH } - printf_filtered (_("Ran %u unit tests, %d failed\n"), - VEC_length (self_test_function_ptr, tests), failed); + printf_filtered (_("Ran %lu unit tests, %d failed\n"), + (long) tests.size (), failed); } -- 2.30.2