summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPete Cooper <peter_cooper@apple.com>2015-01-28 21:34:05 +0000
committerPete Cooper <peter_cooper@apple.com>2015-01-28 21:34:05 +0000
commit1d2f63a4efe9e65d91edbb6a8cb3fb801000d3d2 (patch)
tree97c41e43a15cb41fa6b71127f25503661f417186
parentffa7dc379f2e5df7a19e4ee01dea11c9d329d2bb (diff)
downloadbcm5719-llvm-1d2f63a4efe9e65d91edbb6a8cb3fb801000d3d2.tar.gz
bcm5719-llvm-1d2f63a4efe9e65d91edbb6a8cb3fb801000d3d2.zip
Updated tools to match r227345 which changed the getRegisteredOptions method
llvm-svn: 227372
-rw-r--r--clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp3
-rw-r--r--clang-tools-extra/clang-modernize/tool/ClangModernize.cpp3
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 607b665f05c..90340a7d8f1 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<tooling::Replacement> &Replacements,
int main(int argc, char **argv) {
// Only include our options in -help output.
- StringMap<cl::Option*> OptMap;
- cl::getRegisteredOptions(OptMap);
+ StringMap<cl::Option*> &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 56a01313ce9..b560810ff64 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<cl::Option*> Options;
- cl::getRegisteredOptions(Options);
+ llvm::StringMap<cl::Option*> &Options = cl::getRegisteredOptions();
const cl::OptionCategory **CategoryEnd =
VisibleCategories + llvm::array_lengthof(VisibleCategories);
for (llvm::StringMap<cl::Option *>::iterator I = Options.begin(),
OpenPOWER on IntegriCloud