diff options
| author | Greg Clayton <gclayton@apple.com> | 2016-02-09 23:25:54 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2016-02-09 23:25:54 +0000 |
| commit | 343f898443dec2661e27ddd4768c01f93132c996 (patch) | |
| tree | 0b8d6d65dfa01fe46880efd5b80fd40e5c4e246a | |
| parent | e7e6217d2bf6b07d8144540915713766ada1c9e6 (diff) | |
| download | bcm5719-llvm-343f898443dec2661e27ddd4768c01f93132c996.tar.gz bcm5719-llvm-343f898443dec2661e27ddd4768c01f93132c996.zip | |
Added code that was commented out during testing to stops template member functions from being added to class definitions (see revision 260308 for details).
<rdar://problem/24483905>
<rdar://problem/24508374>
llvm-svn: 260322
| -rw-r--r-- | lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp index 8282b43c198..a0278fa25e2 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp @@ -1214,11 +1214,11 @@ DWARFASTParserClang::ParseTypeFromDWARF (const SymbolContext& sc, // that may or may not include these member functions and this means one class won't match another // class definition and it affects our ability to use a class in the clang expression parser. So // for the greater good, we currently must not allow any template member functions in a class definition. -// if (is_cxx_method && has_template_params) -// { -// ignore_containing_context = true; -// is_cxx_method = false; -// } + if (is_cxx_method && has_template_params) + { + ignore_containing_context = true; + is_cxx_method = false; + } // clang_type will get the function prototype clang type after this call clang_type = m_ast.CreateFunctionType (return_clang_type, |

