input.cc: rename file_cache:in_context

No functional change intended.

gcc/ChangeLog:
	* input.cc (file_cache::initialize_input_context): Rename member
	"in_context" to "m_input_context".
	(file_cache::add_file): Likewise.
	* input.h (class file_cache): Likewise.

Signed-off-by: David Malcolm <dmalcolm@redhat.com>

diff --git a/gcc/input.cc b/gcc/input.cc
index 20b5f62371ac9c6a64f5798f59a1b3704f25aec4..7fc683db23f197fab26fcc4a93263b672df1533c 100644 (file)
--- a/gcc/input.cc
+++ b/gcc/input.cc
@@ -45,8 +45,8 @@ void
 file_cache::initialize_input_context (diagnostic_input_charset_callback ccb,
                                      bool should_skip_bom)
 {
-  in_context.ccb = (ccb ? ccb : default_charset_callback);
-  in_context.should_skip_bom = should_skip_bom;
+  m_input_context.ccb = (ccb ? ccb : default_charset_callback);
+  m_input_context.should_skip_bom = should_skip_bom;
 }
 
 /* This is a cache used by get_next_line to store the content of a
@@ -435,7 +435,7 @@ file_cache::add_file (const char *file_path)
 
   unsigned highest_use_count = 0;
   file_cache_slot *r = evicted_cache_tab_entry (&highest_use_count);
-  if (!r->create (in_context, file_path, fp, highest_use_count))
+  if (!r->create (m_input_context, file_path, fp, highest_use_count))
     return NULL;
   return r;
 }

diff --git a/gcc/input.h b/gcc/input.h
index c6eb1aeda3e9c1567358725a36f0e34a6967640a..a5863eb9e0916bd2c681b96cf6e3e545757204d3 100644 (file)
--- a/gcc/input.h
+++ b/gcc/input.h
@@ -162,7 +162,7 @@ class file_cache
  private:
   static const size_t num_file_slots = 16;
   file_cache_slot *m_file_slots;
-  input_context in_context;
+  input_context m_input_context;
 };
 
 extern expanded_location