summaryrefslogtreecommitdiff
path: root/gdb/cli-out.h
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2016-11-30 21:46:08 -0500
committerSimon Marchi <simon.marchi@polymtl.ca>2016-11-30 21:46:09 -0500
commitb9b118c3bb29052ee76c6bf32b99962cda5113ba (patch)
treedcfccc275d86af74f0df35b61247a98b5ccd0fb1 /gdb/cli-out.h
parent4a9d4ea535a6c9b8c2e7cdf91377abe284d0b277 (diff)
Use std::vector for cli_ui_out_data::streams
Use a standard vector instead of the home-made version. I used a vector of plain pointers, because the cli_ui_out_data object doesn't own the streams objects (i.e. they shouldn't be deleted when the vector is deleted). gdb/ChangeLog: * cli-out.h (cli_ui_out_data) <streams>: Change type to std::vector. * cli-out.c: Remove vec.h include. (cli_uiout_dtor): Update. (cli_field_fmt): Update. (cli_spaces): Update. (cli_text): Update. (cli_message): Update. (cli_flush): Update. (cli_redirect): Update. (out_field_fmt): Update. (field_separator): Update. (cli_out_data_ctor): Update. (cli_out_new): Update. (cli_out_set_stream): Update.
Diffstat (limited to 'gdb/cli-out.h')
-rw-r--r--gdb/cli-out.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/gdb/cli-out.h b/gdb/cli-out.h
index 55d80a70d5..296b8c0f47 100644
--- a/gdb/cli-out.h
+++ b/gdb/cli-out.h
@@ -21,19 +21,14 @@
#define CLI_OUT_H
#include "ui-out.h"
-#include "vec.h"
-
-/* Used for cli_ui_out_data->streams. */
-
-typedef struct ui_file *ui_filep;
-DEF_VEC_P (ui_filep);
+#include <vector>
/* These are exported so that they can be extended by other `ui_out'
implementations, like TUI's. */
struct cli_ui_out_data
{
- VEC (ui_filep) *streams;
+ std::vector<ui_file *> streams;
int suppress_output;
};