aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/dmd/cppmangle.c
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/dmd/cppmangle.c
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/dmd/cppmangle.c')
-rw-r--r--gcc/d/dmd/cppmangle.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/d/dmd/cppmangle.c b/gcc/d/dmd/cppmangle.c
index ee19bd1..b361d37 100644
--- a/gcc/d/dmd/cppmangle.c
+++ b/gcc/d/dmd/cppmangle.c
@@ -632,7 +632,7 @@ class CppMangleVisitor : public Visitor
* ::= <prefix> <data-member-prefix>
*/
prefix_name(p);
- //printf("p: %s\n", buf.peekString());
+ //printf("p: %s\n", buf.peekChars());
if (d->isCtorDeclaration())
{
@@ -1110,7 +1110,7 @@ public:
{
buf->writestring("_ZTI");
cpp_mangle_name(s, false);
- return buf->extractString();
+ return buf->extractChars();
}
};
@@ -1120,7 +1120,7 @@ const char *toCppMangleItanium(Dsymbol *s)
OutBuffer buf;
CppMangleVisitor v(&buf, s->loc);
v.mangleOf(s);
- return buf.extractString();
+ return buf.extractChars();
}
const char *cppTypeInfoMangleItanium(Dsymbol *s)
@@ -1130,5 +1130,5 @@ const char *cppTypeInfoMangleItanium(Dsymbol *s)
buf.writestring("_ZTI"); // "TI" means typeinfo structure
CppMangleVisitor v(&buf, s->loc);
v.cpp_mangle_name(s, false);
- return buf.extractString();
+ return buf.extractChars();
}