[Import as member] Bring up to date with fixes from master

This commit is contained in:
Michael Ilseman
2016-03-23 17:02:03 -07:00
parent 47e73ad4f1
commit bb43d88792
5 changed files with 13 additions and 17 deletions

View File

@@ -877,7 +877,7 @@ static bool ParseClangImporterArgs(ClangImporterOptions &Opts,
});
}
Opts.InferDefaultArguments |= Args.hasArg(OPT_enable_infer_default_arguments);
Opts.InferImportAsMember |= Args.hasArg(OPT_enable_infer_import_as_member);
Opts.DumpClangDiagnostics |= Args.hasArg(OPT_dump_clang_diagnostics);
if (Args.hasArg(OPT_embed_bitcode))