summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2016-11-15 17:51:07 +0000
committerRui Ueyama <ruiu@google.com>2016-11-15 17:51:07 +0000
commit2a00b8461c4c4bfed589a5a880ad09a2a9ea2b9d (patch)
tree3d8ee85786c488bca6f6f9e2eee3807b83a0cedc
parent49fe4037a1e696b444b8edc81ec849b295088939 (diff)
downloadbcm5719-llvm-2a00b8461c4c4bfed589a5a880ad09a2a9ea2b9d.tar.gz
bcm5719-llvm-2a00b8461c4c4bfed589a5a880ad09a2a9ea2b9d.zip
Rename function to avoid function overloading.
We had two functions with the same name to read completely different things. That was confusing. llvm-svn: 286991
-rw-r--r--lld/ELF/LinkerScript.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index a202dc5e3e2..1f65c3703f9 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -986,7 +986,7 @@ private:
Expr readParenExpr();
// For parsing version script.
- void readExtern(std::vector<SymbolVersion> *Globals);
+ void readVersionExtern(std::vector<SymbolVersion> *Globals);
void readVersionDeclaration(StringRef VerStr);
void readGlobal(StringRef VerStr);
void readLocal(StringRef VerStr);
@@ -1824,7 +1824,7 @@ void ScriptParser::readLocal(StringRef VerStr) {
}
}
-void ScriptParser::readExtern(std::vector<SymbolVersion> *Globals) {
+void ScriptParser::readVersionExtern(std::vector<SymbolVersion> *Globals) {
expect("\"C++\"");
expect("{");
@@ -1849,7 +1849,7 @@ void ScriptParser::readGlobal(StringRef VerStr) {
for (;;) {
if (consume("extern"))
- readExtern(Globals);
+ readVersionExtern(Globals);
StringRef Cur = peek();
if (Cur == "}" || Cur == "local:" || Error)
OpenPOWER on IntegriCloud