diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-02 21:29:30 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-02 21:29:30 +0000 |
| commit | 442906470441699a0cffb2c475ee2fa6e6e57515 (patch) | |
| tree | bbbef432354ebeb711fa2c51fe72874e072a8be9 /contrib/llvm/tools/clang/utils/TableGen/ClangASTNodesEmitter.cpp | |
| parent | d88c1a5a572cdb661c111098831fa526e933756f (diff) | |
| parent | bab175ec4b075c8076ba14c762900392533f6ee4 (diff) | |
| download | src-442906470441699a0cffb2c475ee2fa6e6e57515.tar.gz src-442906470441699a0cffb2c475ee2fa6e6e57515.zip | |
Update clang to trunk r290819 and resolve conflicts.
Notes
Notes:
svn path=/projects/clang400-import/; revision=311143
Diffstat (limited to 'contrib/llvm/tools/clang/utils/TableGen/ClangASTNodesEmitter.cpp')
| -rw-r--r-- | contrib/llvm/tools/clang/utils/TableGen/ClangASTNodesEmitter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/utils/TableGen/ClangASTNodesEmitter.cpp b/contrib/llvm/tools/clang/utils/TableGen/ClangASTNodesEmitter.cpp index b17a4a374a29..b132dcbead5c 100644 --- a/contrib/llvm/tools/clang/utils/TableGen/ClangASTNodesEmitter.cpp +++ b/contrib/llvm/tools/clang/utils/TableGen/ClangASTNodesEmitter.cpp @@ -47,7 +47,7 @@ class ClangASTNodesEmitter { if (&R == &Root && !BaseSuffix.empty()) return BaseSuffix; - return R.getName() + BaseSuffix; + return R.getName().str() + BaseSuffix; } std::pair<Record *, Record *> EmitNode (const ChildMap &Tree, raw_ostream& OS, |