Author: maskray Date: Sun Aug 4 22:43:48 2019 New Revision: 367800 URL: http://llvm.org/viewvc/llvm-project?rev=367800&view=rev Log: Rename F_{None,Text,Append} to OF_{None,Text,Append}. NFC
F_{None,Text,Append} are kept for compatibility since r334221. Modified: cfe/trunk/lib/ARCMigrate/FileRemapper.cpp cfe/trunk/lib/ARCMigrate/ObjCMT.cpp cfe/trunk/lib/ARCMigrate/PlistReporter.cpp cfe/trunk/lib/CodeGen/BackendUtil.cpp cfe/trunk/lib/Driver/Compilation.cpp cfe/trunk/lib/Driver/ToolChains/Clang.cpp cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp cfe/trunk/lib/Frontend/CompilerInstance.cpp cfe/trunk/lib/Frontend/DependencyFile.cpp cfe/trunk/lib/Frontend/DependencyGraph.cpp cfe/trunk/lib/Frontend/FrontendActions.cpp cfe/trunk/lib/Frontend/HeaderIncludeGen.cpp cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp cfe/trunk/lib/Frontend/Rewrite/FixItRewriter.cpp cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp cfe/trunk/lib/Serialization/ASTReader.cpp cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp cfe/trunk/lib/StaticAnalyzer/Core/SarifDiagnostics.cpp cfe/trunk/tools/clang-offload-bundler/ClangOffloadBundler.cpp cfe/trunk/tools/clang-refactor/ClangRefactor.cpp cfe/trunk/tools/clang-rename/ClangRename.cpp cfe/trunk/tools/driver/cc1as_main.cpp Modified: cfe/trunk/lib/ARCMigrate/FileRemapper.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/FileRemapper.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/ARCMigrate/FileRemapper.cpp (original) +++ cfe/trunk/lib/ARCMigrate/FileRemapper.cpp Sun Aug 4 22:43:48 2019 @@ -121,7 +121,7 @@ bool FileRemapper::flushToFile(StringRef std::error_code EC; std::string infoFile = outputPath; - llvm::raw_fd_ostream infoOut(infoFile, EC, llvm::sys::fs::F_None); + llvm::raw_fd_ostream infoOut(infoFile, EC, llvm::sys::fs::OF_None); if (EC) return report(EC.message(), Diag); @@ -177,7 +177,7 @@ bool FileRemapper::overwriteOriginal(Dia Diag); std::error_code EC; - llvm::raw_fd_ostream Out(origFE->getName(), EC, llvm::sys::fs::F_None); + llvm::raw_fd_ostream Out(origFE->getName(), EC, llvm::sys::fs::OF_None); if (EC) return report(EC.message(), Diag); Modified: cfe/trunk/lib/ARCMigrate/ObjCMT.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/ObjCMT.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/ARCMigrate/ObjCMT.cpp (original) +++ cfe/trunk/lib/ARCMigrate/ObjCMT.cpp Sun Aug 4 22:43:48 2019 @@ -1951,7 +1951,7 @@ void ObjCMigrateASTConsumer::HandleTrans if (IsOutputFile) { std::error_code EC; - llvm::raw_fd_ostream OS(MigrateDir, EC, llvm::sys::fs::F_None); + llvm::raw_fd_ostream OS(MigrateDir, EC, llvm::sys::fs::OF_None); if (EC) { DiagnosticsEngine &Diags = Ctx.getDiagnostics(); Diags.Report(Diags.getCustomDiagID(DiagnosticsEngine::Error, "%0")) Modified: cfe/trunk/lib/ARCMigrate/PlistReporter.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/PlistReporter.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/ARCMigrate/PlistReporter.cpp (original) +++ cfe/trunk/lib/ARCMigrate/PlistReporter.cpp Sun Aug 4 22:43:48 2019 @@ -56,7 +56,7 @@ void arcmt::writeARCDiagsToPlist(const s } std::error_code EC; - llvm::raw_fd_ostream o(outPath, EC, llvm::sys::fs::F_Text); + llvm::raw_fd_ostream o(outPath, EC, llvm::sys::fs::OF_Text); if (EC) { llvm::errs() << "error: could not create file: " << outPath << '\n'; return; Modified: cfe/trunk/lib/CodeGen/BackendUtil.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/BackendUtil.cpp (original) +++ cfe/trunk/lib/CodeGen/BackendUtil.cpp Sun Aug 4 22:43:48 2019 @@ -119,7 +119,7 @@ class EmitAssemblyHelper { std::unique_ptr<llvm::ToolOutputFile> openOutputFile(StringRef Path) { std::error_code EC; auto F = llvm::make_unique<llvm::ToolOutputFile>(Path, EC, - llvm::sys::fs::F_None); + llvm::sys::fs::OF_None); if (EC) { Diags.Report(diag::err_fe_unable_to_open_output) << Path << EC.message(); F.reset(); Modified: cfe/trunk/lib/Driver/Compilation.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Compilation.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Driver/Compilation.cpp (original) +++ cfe/trunk/lib/Driver/Compilation.cpp Sun Aug 4 22:43:48 2019 @@ -161,7 +161,7 @@ int Compilation::ExecuteCommand(const Co std::error_code EC; OwnedStream.reset(new llvm::raw_fd_ostream( getDriver().CCPrintOptionsFilename, EC, - llvm::sys::fs::F_Append | llvm::sys::fs::F_Text)); + llvm::sys::fs::OF_Append | llvm::sys::fs::OF_Text)); if (EC) { getDriver().Diag(diag::err_drv_cc_print_options_failure) << EC.message(); Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Sun Aug 4 22:43:48 2019 @@ -1995,7 +1995,8 @@ void Clang::DumpCompilationDatabase(Comp if (!CompilationDatabase) { std::error_code EC; - auto File = llvm::make_unique<llvm::raw_fd_ostream>(Filename, EC, llvm::sys::fs::F_Text); + auto File = llvm::make_unique<llvm::raw_fd_ostream>(Filename, EC, + llvm::sys::fs::OF_Text); if (EC) { D.Diag(clang::diag::err_drv_compilationdatabase) << Filename << EC.message(); Modified: cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp Sun Aug 4 22:43:48 2019 @@ -1350,7 +1350,7 @@ void tools::AddOpenMPLinkerScript(const // Open script file and write the contents. std::error_code EC; - llvm::raw_fd_ostream Lksf(LKS, EC, llvm::sys::fs::F_None); + llvm::raw_fd_ostream Lksf(LKS, EC, llvm::sys::fs::OF_None); if (EC) { C.getDriver().Diag(clang::diag::err_unable_to_make_temp) << EC.message(); @@ -1458,7 +1458,7 @@ void tools::AddHIPLinkerScript(const Too // Open script file and write the contents. std::error_code EC; - llvm::raw_fd_ostream Lksf(LKS, EC, llvm::sys::fs::F_None); + llvm::raw_fd_ostream Lksf(LKS, EC, llvm::sys::fs::OF_None); if (EC) { C.getDriver().Diag(clang::diag::err_unable_to_make_temp) << EC.message(); Modified: cfe/trunk/lib/Frontend/CompilerInstance.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInstance.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/CompilerInstance.cpp (original) +++ cfe/trunk/lib/Frontend/CompilerInstance.cpp Sun Aug 4 22:43:48 2019 @@ -216,7 +216,7 @@ static void SetUpDiagnosticLog(Diagnosti // Create the output stream. auto FileOS = llvm::make_unique<llvm::raw_fd_ostream>( DiagOpts->DiagnosticLogFile, EC, - llvm::sys::fs::F_Append | llvm::sys::fs::F_Text); + llvm::sys::fs::OF_Append | llvm::sys::fs::OF_Text); if (EC) { Diags.Report(diag::warn_fe_cc_log_diagnostics_failure) << DiagOpts->DiagnosticLogFile << EC.message(); @@ -775,7 +775,7 @@ std::unique_ptr<llvm::raw_pwrite_stream> OSFile = OutFile; OS.reset(new llvm::raw_fd_ostream( OSFile, Error, - (Binary ? llvm::sys::fs::F_None : llvm::sys::fs::F_Text))); + (Binary ? llvm::sys::fs::OF_None : llvm::sys::fs::OF_Text))); if (Error) return nullptr; } @@ -987,8 +987,8 @@ bool CompilerInstance::ExecuteAction(Fro StringRef StatsFile = getFrontendOpts().StatsFile; if (!StatsFile.empty()) { std::error_code EC; - auto StatS = llvm::make_unique<llvm::raw_fd_ostream>(StatsFile, EC, - llvm::sys::fs::F_Text); + auto StatS = llvm::make_unique<llvm::raw_fd_ostream>( + StatsFile, EC, llvm::sys::fs::OF_Text); if (EC) { getDiagnostics().Report(diag::warn_fe_unable_to_open_stats_file) << StatsFile << EC.message(); @@ -1370,7 +1370,7 @@ static void checkConfigMacro(Preprocesso /// Write a new timestamp file with the given path. static void writeTimestampFile(StringRef TimestampFile) { std::error_code EC; - llvm::raw_fd_ostream Out(TimestampFile.str(), EC, llvm::sys::fs::F_None); + llvm::raw_fd_ostream Out(TimestampFile.str(), EC, llvm::sys::fs::OF_None); } /// Prune the module cache of modules that haven't been accessed in Modified: cfe/trunk/lib/Frontend/DependencyFile.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/DependencyFile.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/DependencyFile.cpp (original) +++ cfe/trunk/lib/Frontend/DependencyFile.cpp Sun Aug 4 22:43:48 2019 @@ -316,7 +316,7 @@ void DependencyFileGenerator::outputDepe } std::error_code EC; - llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::F_Text); + llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::OF_Text); if (EC) { Diags.Report(diag::err_fe_error_opening) << OutputFile << EC.message(); return; Modified: cfe/trunk/lib/Frontend/DependencyGraph.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/DependencyGraph.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/DependencyGraph.cpp (original) +++ cfe/trunk/lib/Frontend/DependencyGraph.cpp Sun Aug 4 22:43:48 2019 @@ -100,7 +100,7 @@ DependencyGraphCallback::writeNodeRefere void DependencyGraphCallback::OutputGraphFile() { std::error_code EC; - llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::F_Text); + llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::OF_Text); if (EC) { PP->getDiagnostics().Report(diag::err_fe_error_opening) << OutputFile << EC.message(); Modified: cfe/trunk/lib/Frontend/FrontendActions.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendActions.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/FrontendActions.cpp (original) +++ cfe/trunk/lib/Frontend/FrontendActions.cpp Sun Aug 4 22:43:48 2019 @@ -695,7 +695,7 @@ void DumpModuleInfoAction::ExecuteAction if (!OutputFileName.empty() && OutputFileName != "-") { std::error_code EC; OutFile.reset(new llvm::raw_fd_ostream(OutputFileName.str(), EC, - llvm::sys::fs::F_Text)); + llvm::sys::fs::OF_Text)); } llvm::raw_ostream &Out = OutFile.get()? *OutFile.get() : llvm::outs(); Modified: cfe/trunk/lib/Frontend/HeaderIncludeGen.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/HeaderIncludeGen.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/HeaderIncludeGen.cpp (original) +++ cfe/trunk/lib/Frontend/HeaderIncludeGen.cpp Sun Aug 4 22:43:48 2019 @@ -100,7 +100,8 @@ void clang::AttachHeaderIncludeGen(Prepr if (!OutputPath.empty()) { std::error_code EC; llvm::raw_fd_ostream *OS = new llvm::raw_fd_ostream( - OutputPath.str(), EC, llvm::sys::fs::F_Append | llvm::sys::fs::F_Text); + OutputPath.str(), EC, + llvm::sys::fs::OF_Append | llvm::sys::fs::OF_Text); if (EC) { PP.getDiagnostics().Report(clang::diag::warn_fe_cc_print_header_failure) << EC.message(); Modified: cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp (original) +++ cfe/trunk/lib/Frontend/ModuleDependencyCollector.cpp Sun Aug 4 22:43:48 2019 @@ -148,7 +148,7 @@ void ModuleDependencyCollector::writeFil std::error_code EC; SmallString<256> YAMLPath = VFSDir; llvm::sys::path::append(YAMLPath, "vfs.yaml"); - llvm::raw_fd_ostream OS(YAMLPath, EC, llvm::sys::fs::F_Text); + llvm::raw_fd_ostream OS(YAMLPath, EC, llvm::sys::fs::OF_Text); if (EC) { HasErrors = true; return; Modified: cfe/trunk/lib/Frontend/Rewrite/FixItRewriter.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/Rewrite/FixItRewriter.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/Rewrite/FixItRewriter.cpp (original) +++ cfe/trunk/lib/Frontend/Rewrite/FixItRewriter.cpp Sun Aug 4 22:43:48 2019 @@ -101,7 +101,7 @@ bool FixItRewriter::WriteFixedFiles( if (fd != -1) { OS.reset(new llvm::raw_fd_ostream(fd, /*shouldClose=*/true)); } else { - OS.reset(new llvm::raw_fd_ostream(Filename, EC, llvm::sys::fs::F_None)); + OS.reset(new llvm::raw_fd_ostream(Filename, EC, llvm::sys::fs::OF_None)); } if (EC) { Diags.Report(clang::diag::err_fe_unable_to_open_output) << Filename Modified: cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp (original) +++ cfe/trunk/lib/Frontend/SerializedDiagnosticPrinter.cpp Sun Aug 4 22:43:48 2019 @@ -781,7 +781,7 @@ void SDiagsWriter::finish() { std::error_code EC; auto OS = llvm::make_unique<llvm::raw_fd_ostream>(State->OutputFile.c_str(), - EC, llvm::sys::fs::F_None); + EC, llvm::sys::fs::OF_None); if (EC) { getMetaDiags()->Report(diag::warn_fe_serialized_diag_failure) << State->OutputFile << EC.message(); Modified: cfe/trunk/lib/Serialization/ASTReader.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/Serialization/ASTReader.cpp (original) +++ cfe/trunk/lib/Serialization/ASTReader.cpp Sun Aug 4 22:43:48 2019 @@ -4042,7 +4042,7 @@ static void updateModuleTimestamp(Module // Overwrite the timestamp file contents so that file's mtime changes. std::string TimestampFilename = MF.getTimestampFilename(); std::error_code EC; - llvm::raw_fd_ostream OS(TimestampFilename, EC, llvm::sys::fs::F_Text); + llvm::raw_fd_ostream OS(TimestampFilename, EC, llvm::sys::fs::OF_Text); if (EC) return; OS << "Timestamp file\n"; Modified: cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp Sun Aug 4 22:43:48 2019 @@ -599,7 +599,7 @@ void PlistDiagnostics::FlushDiagnosticsI // Open the file. std::error_code EC; - llvm::raw_fd_ostream o(OutputFile, EC, llvm::sys::fs::F_Text); + llvm::raw_fd_ostream o(OutputFile, EC, llvm::sys::fs::OF_Text); if (EC) { llvm::errs() << "warning: could not create file: " << EC.message() << '\n'; return; Modified: cfe/trunk/lib/StaticAnalyzer/Core/SarifDiagnostics.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/SarifDiagnostics.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/SarifDiagnostics.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Core/SarifDiagnostics.cpp Sun Aug 4 22:43:48 2019 @@ -335,7 +335,7 @@ void SarifDiagnostics::FlushDiagnosticsI // file can become large very quickly, so decoding into JSON to append a run // may be an expensive operation. std::error_code EC; - llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::F_Text); + llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::OF_Text); if (EC) { llvm::errs() << "warning: could not create file: " << EC.message() << '\n'; return; Modified: cfe/trunk/tools/clang-offload-bundler/ClangOffloadBundler.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-offload-bundler/ClangOffloadBundler.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/tools/clang-offload-bundler/ClangOffloadBundler.cpp (original) +++ cfe/trunk/tools/clang-offload-bundler/ClangOffloadBundler.cpp Sun Aug 4 22:43:48 2019 @@ -559,7 +559,7 @@ public: // Write the bitcode contents to the temporary file. { std::error_code EC; - raw_fd_ostream BitcodeFile(BitcodeFileName, EC, sys::fs::F_None); + raw_fd_ostream BitcodeFile(BitcodeFileName, EC, sys::fs::OF_None); if (EC) { errs() << "error: unable to open temporary file.\n"; return true; @@ -764,7 +764,7 @@ static bool BundleFiles() { std::error_code EC; // Create output file. - raw_fd_ostream OutputFile(OutputFileNames.front(), EC, sys::fs::F_None); + raw_fd_ostream OutputFile(OutputFileNames.front(), EC, sys::fs::OF_None); if (EC) { errs() << "error: Can't open file " << OutputFileNames.front() << ".\n"; @@ -862,7 +862,7 @@ static bool UnbundleFiles() { // Check if the output file can be opened and copy the bundle to it. std::error_code EC; - raw_fd_ostream OutputFile(Output->second, EC, sys::fs::F_None); + raw_fd_ostream OutputFile(Output->second, EC, sys::fs::OF_None); if (EC) { errs() << "error: Can't open file " << Output->second << ": " << EC.message() << "\n"; @@ -882,7 +882,7 @@ static bool UnbundleFiles() { if (Worklist.size() == TargetNames.size()) { for (auto &E : Worklist) { std::error_code EC; - raw_fd_ostream OutputFile(E.second, EC, sys::fs::F_None); + raw_fd_ostream OutputFile(E.second, EC, sys::fs::OF_None); if (EC) { errs() << "error: Can't open file " << E.second << ": " << EC.message() << "\n"; @@ -905,7 +905,7 @@ static bool UnbundleFiles() { // If we still have any elements in the worklist, create empty files for them. for (auto &E : Worklist) { std::error_code EC; - raw_fd_ostream OutputFile(E.second, EC, sys::fs::F_None); + raw_fd_ostream OutputFile(E.second, EC, sys::fs::OF_None); if (EC) { errs() << "error: Can't open file " << E.second << ": " << EC.message() << "\n"; Modified: cfe/trunk/tools/clang-refactor/ClangRefactor.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-refactor/ClangRefactor.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/tools/clang-refactor/ClangRefactor.cpp (original) +++ cfe/trunk/tools/clang-refactor/ClangRefactor.cpp Sun Aug 4 22:43:48 2019 @@ -497,7 +497,7 @@ public: if (opts::Inplace) { std::error_code EC; - llvm::raw_fd_ostream OS(File, EC, llvm::sys::fs::F_Text); + llvm::raw_fd_ostream OS(File, EC, llvm::sys::fs::OF_Text); if (EC) { llvm::errs() << EC.message() << "\n"; return true; Modified: cfe/trunk/tools/clang-rename/ClangRename.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-rename/ClangRename.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/tools/clang-rename/ClangRename.cpp (original) +++ cfe/trunk/tools/clang-rename/ClangRename.cpp Sun Aug 4 22:43:48 2019 @@ -188,7 +188,7 @@ int main(int argc, const char **argv) { if (!ExportFixes.empty()) { std::error_code EC; - llvm::raw_fd_ostream OS(ExportFixes, EC, llvm::sys::fs::F_None); + llvm::raw_fd_ostream OS(ExportFixes, EC, llvm::sys::fs::OF_None); if (EC) { llvm::errs() << "Error opening output file: " << EC.message() << '\n'; return 1; Modified: cfe/trunk/tools/driver/cc1as_main.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=367800&r1=367799&r2=367800&view=diff ============================================================================== --- cfe/trunk/tools/driver/cc1as_main.cpp (original) +++ cfe/trunk/tools/driver/cc1as_main.cpp Sun Aug 4 22:43:48 2019 @@ -313,7 +313,7 @@ getOutputStream(StringRef Path, Diagnost std::error_code EC; auto Out = llvm::make_unique<raw_fd_ostream>( - Path, EC, (Binary ? sys::fs::F_None : sys::fs::F_Text)); + Path, EC, (Binary ? sys::fs::OF_None : sys::fs::OF_Text)); if (EC) { Diags.Report(diag::err_fe_unable_to_open_output) << Path << EC.message(); return nullptr; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits