From: Axel Naumann Date: Mon, 11 Oct 2010 09:13:46 +0000 (+0000) Subject: Tighten up constness of argv parameters to allow for string literals as argumants... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d0c4ccd65b4549283c55e4923602e234f3811c5;p=clang Tighten up constness of argv parameters to allow for string literals as argumants and to reflect actual (non-modifying) use. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116199 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Frontend/CompilerInstance.h b/include/clang/Frontend/CompilerInstance.h index 800d5be068..410129ab7a 100644 --- a/include/clang/Frontend/CompilerInstance.h +++ b/include/clang/Frontend/CompilerInstance.h @@ -474,7 +474,7 @@ public: /// and replace any existing one with it. /// /// Note that this routine also replaces the diagnostic client. - void createDiagnostics(int Argc, char **Argv); + void createDiagnostics(int Argc, const char* const *Argv); /// Create a Diagnostic object with a the TextDiagnosticPrinter. /// @@ -492,7 +492,8 @@ public: /// /// \return The new object on success, or null on failure. static llvm::IntrusiveRefCntPtr - createDiagnostics(const DiagnosticOptions &Opts, int Argc, char **Argv); + createDiagnostics(const DiagnosticOptions &Opts, int Argc, + const char* const *Argv); /// Create the file manager and replace any existing one with it. void createFileManager(); diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index e3eb859153..939766351d 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -109,7 +109,7 @@ void BinaryDiagnosticSerializer::HandleDiagnostic(Diagnostic::Level DiagLevel, } static void SetUpBuildDumpLog(const DiagnosticOptions &DiagOpts, - unsigned argc, char **argv, + unsigned argc, const char* const *argv, Diagnostic &Diags) { std::string ErrorInfo; llvm::OwningPtr OS( @@ -131,13 +131,13 @@ static void SetUpBuildDumpLog(const DiagnosticOptions &DiagOpts, Diags.setClient(new ChainedDiagnosticClient(Diags.takeClient(), Logger)); } -void CompilerInstance::createDiagnostics(int Argc, char **Argv) { +void CompilerInstance::createDiagnostics(int Argc, const char* const *Argv) { Diagnostics = createDiagnostics(getDiagnosticOpts(), Argc, Argv); } llvm::IntrusiveRefCntPtr CompilerInstance::createDiagnostics(const DiagnosticOptions &Opts, - int Argc, char **Argv) { + int Argc, const char* const *Argv) { llvm::IntrusiveRefCntPtr Diags(new Diagnostic()); // Create the diagnostic client for reporting errors or for