From: Simon Marchi <simon.marchi@ericsson.com>
Date: Thu, 23 Nov 2017 16:05:22 +0000 (-0500)
Subject: Revert unexpected rename in previous patch
X-Git-Tag: users/ARM/embedded-binutils-master-2017q4~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd046f64a193405f2fef2d5120fab4be25feaa8b;p=thirdparty%2Fbinutils-gdb.git

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.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c7dbab51029..3fdeae1879c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+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.
diff --git a/gdb/varobj.c b/gdb/varobj.c
index ce324b7af52..93b97f6f70c 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;