aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2017-11-23 11:05:22 -0500
committerSimon Marchi <simon.marchi@ericsson.com>2017-11-23 11:05:22 -0500
commitbd046f64a193405f2fef2d5120fab4be25feaa8b (patch)
tree808f18ba8d4b12bc2410f3afeecfe66ad0990aa9
parent4c37490d92c0168e5192ce109a791c4b3fec9f8e (diff)
downloadgdb-bd046f64a193405f2fef2d5120fab4be25feaa8b.zip
gdb-bd046f64a193405f2fef2d5120fab4be25feaa8b.tar.gz
gdb-bd046f64a193405f2fef2d5120fab4be25feaa8b.tar.bz2
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) <children_requested_>: Rename back to... <children_requested>: ... this. (varobj_get_num_children, varobj_update): Adjust.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/varobj.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c7dbab5..3fdeae1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
2017-11-23 Simon Marchi <simon.marchi@ericsson.com>
+ * varobj.c (struct varobj_dynamic) <children_requested_>: Rename
+ back to...
+ <children_requested>: ... this.
+ (varobj_get_num_children, varobj_update): Adjust.
+
+2017-11-23 Simon Marchi <simon.marchi@ericsson.com>
+
* ada-varobj.c (ada_value_is_changeable_p): Change int to bool where applicable.
(ada_value_has_mutated): Likewise.
* c-varobj.c (varobj_is_anonymous_child): Likewise.
diff --git a/gdb/varobj.c b/gdb/varobj.c
index ce324b7..93b97f6 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 *> &
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;