From bd046f64a193405f2fef2d5120fab4be25feaa8b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 23 Nov 2017 11:05:22 -0500 Subject: [PATCH] Revert unexpected rename in previous patch While working on the previous patch, I renamed variables whose type I changed to let the compiler help me find their usages, but I forgot to rename one back to its original name. This patch fixes it. gdb/ChangeLog: * varobj.c (struct varobj_dynamic) : Rename back to... : ... this. (varobj_get_num_children, varobj_update): Adjust. --- gdb/ChangeLog | 7 +++++++ gdb/varobj.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c7dbab5102..3fdeae1879 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2017-11-23 Simon Marchi + + * varobj.c (struct varobj_dynamic) : Rename + back to... + : ... this. + (varobj_get_num_children, varobj_update): Adjust. + 2017-11-23 Simon Marchi * ada-varobj.c (ada_value_is_changeable_p): Change int to bool where applicable. diff --git a/gdb/varobj.c b/gdb/varobj.c index ce324b7af5..93b97f6f70 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -113,7 +113,7 @@ struct varobj_dynamic used to decide if dynamic varobj should recompute their children. In the event that the frontend never asked for the children, we can avoid that. */ - bool children_requested_ = false; + bool children_requested = false; /* The pretty-printer constructor. If NULL, then the default pretty-printer will be looked up. If None, then no @@ -839,7 +839,7 @@ varobj_get_num_children (struct varobj *var) const std::vector & varobj_list_children (struct varobj *var, int *from, int *to) { - var->dynamic->children_requested_ = true; + var->dynamic->children_requested = true; if (varobj_is_dynamic_p (var)) { @@ -1629,7 +1629,7 @@ varobj_update (struct varobj **varp, bool is_explicit) if (v->frozen) continue; - if (!v->dynamic->children_requested_) + if (!v->dynamic->children_requested) { bool dummy; -- 2.34.1