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.
This commit is contained in:
Simon Marchi
2016-11-30 21:46:08 -05:00
parent 4a9d4ea535
commit b9b118c3bb
3 changed files with 34 additions and 24 deletions

View File

@@ -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;
};