From: Ata Borla <[email protected]> gcc/rust/ChangeLog: * rust-linemap.cc (instance_): Changed ... nullptr. (Linemap::start_file): Likewise. (Linemap::location_to_string): Likewise.
Signed-off-by: Ata Borla <[email protected]> --- This change was merged into the gccrs repository and is posted here for upstream visibility and potential drive-by review, as requested by GCC release managers. Each commit email contains a link to its details on github from where you can find the Pull-Request and associated discussions. Commit on github: https://github.com/Rust-GCC/gccrs/commit/8b4f3e924201f70ee8e552531a008be655d660d3 The commit has NOT been mentioned in any issue. The commit has been mentioned in the following pull-request(s): - https://github.com/Rust-GCC/gccrs/pull/5054 gcc/rust/rust-linemap.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/rust/rust-linemap.cc b/gcc/rust/rust-linemap.cc index 42ff6b719..ce887cffd 100644 --- a/gcc/rust/rust-linemap.cc +++ b/gcc/rust/rust-linemap.cc @@ -20,7 +20,7 @@ #include "rust-linemap.h" -Linemap *Linemap::instance_ = NULL; +Linemap *Linemap::instance_ = nullptr; // Start getting locations from a new file. @@ -28,7 +28,7 @@ void Linemap::start_file (const char *file_name, unsigned line_begin) { if (this->in_file_) - linemap_add (line_table, LC_LEAVE, 0, NULL, 0); + linemap_add (line_table, LC_LEAVE, 0, nullptr, 0); linemap_add (line_table, LC_ENTER, 0, file_name, line_begin); this->in_file_ = true; } @@ -45,7 +45,7 @@ Linemap::location_to_string (location_t location) // only for simple file:line locations. resolved_location = linemap_resolve_location (line_table, location, LRK_SPELLING_LOCATION, &lmo); - if (lmo == NULL || resolved_location < RESERVED_LOCATION_COUNT) + if (lmo == nullptr || resolved_location < RESERVED_LOCATION_COUNT) return ""; const char *path = LINEMAP_FILE (lmo); if (!path) base-commit: 4f46aa6daf8be3236efdb0f211bbadb5c4c48e50 -- 2.56.0
