No functional change intended.
Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu.
Pushed to trunk as r15-6114-ge4ef3aa2911f1a.
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 <dmalc...@redhat.com>
---
gcc/input.cc | 6 +++---
gcc/input.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gcc/input.cc b/gcc/input.cc
index 20b5f62371ac..7fc683db23f1 100644
--- 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 c6eb1aeda3e9..a5863eb9e091 100644
--- 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
--
2.26.3
