diff options
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 9 | ||||
| -rw-r--r-- | libcpp/include/line-map.h | 7 | ||||
| -rw-r--r-- | libcpp/line-map.c | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 595d6ca..69abc68 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,12 @@ +2016-08-31 David Malcolm <dmalcolm@redhat.com> + + * include/line-map.h (class fixit_remove): Remove stray decl. + (fixit_hint::affects_line_p): Make const. + (fixit_insert::affects_line_p): Likewise. + (fixit_replace::affects_line_p): Likewise. + * line-map.c (fixit_insert::affects_line_p): Likewise. + (fixit_replace::affects_line_p): Likewise. + 2016-08-30 David Malcolm <dmalcolm@redhat.com> * include/line-map.h (class semi_embedded_vec): New class. diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index 0c95b29..bef7795 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -1412,7 +1412,6 @@ semi_embedded_vec<T, NUM_EMBEDDED>::truncate (int len) class fixit_hint; class fixit_insert; - class fixit_remove; class fixit_replace; /* A "rich" source code location, for use when printing diagnostics. @@ -1599,7 +1598,7 @@ public: virtual ~fixit_hint () {} virtual enum kind get_kind () const = 0; - virtual bool affects_line_p (const char *file, int line) = 0; + virtual bool affects_line_p (const char *file, int line) const = 0; virtual source_location get_start_loc () const = 0; virtual bool maybe_get_end_loc (source_location *out) const = 0; /* Vfunc for consolidating successor fixits. */ @@ -1615,7 +1614,7 @@ class fixit_insert : public fixit_hint const char *new_content); ~fixit_insert (); enum kind get_kind () const { return INSERT; } - bool affects_line_p (const char *file, int line); + bool affects_line_p (const char *file, int line) const; source_location get_start_loc () const { return m_where; } bool maybe_get_end_loc (source_location *) const { return false; } bool maybe_append_replace (line_maps *set, @@ -1640,7 +1639,7 @@ class fixit_replace : public fixit_hint ~fixit_replace (); enum kind get_kind () const { return REPLACE; } - bool affects_line_p (const char *file, int line); + bool affects_line_p (const char *file, int line) const; source_location get_start_loc () const { return m_src_range.m_start; } bool maybe_get_end_loc (source_location *out) const { diff --git a/libcpp/line-map.c b/libcpp/line-map.c index 72549ba..f69c60c 100644 --- a/libcpp/line-map.c +++ b/libcpp/line-map.c @@ -2314,7 +2314,7 @@ fixit_insert::~fixit_insert () /* Implementation of fixit_hint::affects_line_p for fixit_insert. */ bool -fixit_insert::affects_line_p (const char *file, int line) +fixit_insert::affects_line_p (const char *file, int line) const { expanded_location exploc = linemap_client_expand_location_to_spelling_point (m_where); @@ -2351,7 +2351,7 @@ fixit_replace::~fixit_replace () /* Implementation of fixit_hint::affects_line_p for fixit_replace. */ bool -fixit_replace::affects_line_p (const char *file, int line) +fixit_replace::affects_line_p (const char *file, int line) const { return m_src_range.intersects_line_p (file, line); } |