From 1d2f63a4efe9e65d91edbb6a8cb3fb801000d3d2 Mon Sep 17 00:00:00 2001 From: Pete Cooper Date: Wed, 28 Jan 2015 21:34:05 +0000 Subject: [PATCH] Updated tools to match r227345 which changed the getRegisteredOptions method llvm-svn: 227372 --- .../clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp | 3 +-- clang-tools-extra/clang-modernize/tool/ClangModernize.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp index 607b665..90340a7 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp +++ b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp @@ -197,8 +197,7 @@ bool applyFormatting(const std::vector &Replacements, int main(int argc, char **argv) { // Only include our options in -help output. - StringMap OptMap; - cl::getRegisteredOptions(OptMap); + StringMap &OptMap = cl::getRegisteredOptions(); const char **EndOpts = std::end(OptionsToShow); for (const auto &Opt : OptMap) { if (std::find(OptionsToShow, EndOpts, Opt.getKey()) == EndOpts) diff --git a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp index 56a0131..b560810 100644 --- a/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp +++ b/clang-tools-extra/clang-modernize/tool/ClangModernize.cpp @@ -307,8 +307,7 @@ int main(int argc, const char **argv) { // Hide all options we don't define ourselves. Move pre-defined 'help', // 'help-list', and 'version' to our general category. - llvm::StringMap Options; - cl::getRegisteredOptions(Options); + llvm::StringMap &Options = cl::getRegisteredOptions(); const cl::OptionCategory **CategoryEnd = VisibleCategories + llvm::array_lengthof(VisibleCategories); for (llvm::StringMap::iterator I = Options.begin(), -- 2.7.4