diff options
author | Craig Topper <craig.topper@gmail.com> | 2014-10-31 06:57:07 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2014-10-31 06:57:07 +0000 |
commit | 9ad7e266513cb3c3a98b0be16547cbcfa77a29ba (patch) | |
tree | 57030749504cb3a0c5e9f3cf8a3f89527bcbc58e /clang/lib/Parse/Parser.cpp | |
parent | 5b24759dfffc6f8d4c76e08e48fb16a2366c8d40 (diff) | |
download | bcm5719-llvm-9ad7e266513cb3c3a98b0be16547cbcfa77a29ba.tar.gz bcm5719-llvm-9ad7e266513cb3c3a98b0be16547cbcfa77a29ba.zip |
Remove a couple typedefs for things in the clang namespace with the same name. Remove a typedef that matches an identical one in the clang namespace.
llvm-svn: 220954
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
-rw-r--r-- | clang/lib/Parse/Parser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 90d2815b4f8..9367ef7c745 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -1224,7 +1224,7 @@ void Parser::ParseKNRParamDeclarations(Declarator &D) { /// [GNU] asm-string-literal: /// string-literal /// -Parser::ExprResult Parser::ParseAsmStringLiteral() { +ExprResult Parser::ParseAsmStringLiteral() { switch (Tok.getKind()) { case tok::string_literal: break; @@ -1252,7 +1252,7 @@ Parser::ExprResult Parser::ParseAsmStringLiteral() { /// [GNU] simple-asm-expr: /// 'asm' '(' asm-string-literal ')' /// -Parser::ExprResult Parser::ParseSimpleAsm(SourceLocation *EndLoc) { +ExprResult Parser::ParseSimpleAsm(SourceLocation *EndLoc) { assert(Tok.is(tok::kw_asm) && "Not an asm!"); SourceLocation Loc = ConsumeToken(); |