aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/d-lang.cc
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2020-06-07 19:42:58 +0200
committerIain Buclaw <ibuclaw@gdcproject.org>2020-06-07 19:44:20 +0200
commitfced594b313ddfb941913b2f59b10ce3514faaf6 (patch)
tree95a78b41b7a8d4523a5ca102d93487e5b90f3471 /gcc/d/d-lang.cc
parentc3a2ba10b272fd9581560604284da2a6283bcde0 (diff)
downloadgcc-fced594b313ddfb941913b2f59b10ce3514faaf6.zip
gcc-fced594b313ddfb941913b2f59b10ce3514faaf6.tar.gz
gcc-fced594b313ddfb941913b2f59b10ce3514faaf6.tar.bz2
d: Merge upstream dmd 108ca1bcd.
Renames OutBuffer::peekString to OutBuffer::peekChars, and OutBuffer::extractString to OutBuffer::extractChars. All callers have been updated as appropriate. Reviewed-on: https://github.com/dlang/dmd/pull/11247 gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd 108ca1bcd. * d-diagnostic.cc (expand_d_format): Adjust to use extractChars(). * d-frontend.cc (Loc::toChars): Likewise. * d-lang.cc (deps_write): Likewise. (d_parse_file): Likewise. * decl.cc (d_mangle_decl): Likewise. * intrinsics.cc (maybe_set_intrinsic): Likewise.
Diffstat (limited to 'gcc/d/d-lang.cc')
-rw-r--r--gcc/d/d-lang.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc
index 4192193..2bc0def 100644
--- a/gcc/d/d-lang.cc
+++ b/gcc/d/d-lang.cc
@@ -163,7 +163,7 @@ deps_write (Module *module, OutBuffer *buffer, unsigned colmax = 72)
/* Write out make target module name. */
if (d_option.deps_target)
{
- buffer->writestring (d_option.deps_target->extractString ());
+ buffer->writestring (d_option.deps_target->extractChars ());
column = d_option.deps_target->offset;
}
else
@@ -1262,7 +1262,7 @@ d_parse_file (void)
to make the middle-end fully deterministic. */
OutBuffer buf;
mangleToBuffer (Module::rootModule, &buf);
- first_global_object_name = buf.extractString ();
+ first_global_object_name = buf.extractChars ();
}
/* Make dependencies. */