From fd3dbd940393ecfe9e7784664a1d189fa927aec8 Mon Sep 17 00:00:00 2001
From: Chris Bieneman <beanz@apple.com>
Date: Tue, 27 Jan 2015 00:42:00 +0000
Subject: [PATCH] One more fix to the new API to fix const-correctness.

llvm-svn: 227154
---
 llvm/include/llvm/Support/CommandLine.h    | 2 +-
 llvm/lib/Support/CommandLine.cpp           | 2 +-
 llvm/unittests/Support/CommandLineTest.cpp | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/llvm/include/llvm/Support/CommandLine.h b/llvm/include/llvm/Support/CommandLine.h
index c0e9d97..efa1721 100644
--- a/llvm/include/llvm/Support/CommandLine.h
+++ b/llvm/include/llvm/Support/CommandLine.h
@@ -1939,7 +1939,7 @@ void HideUnrelatedOptions(cl::OptionCategory &Category);
 /// Some tools (like clang-format) like to be able to hide all options that are
 /// not specific to the tool. This function allows a tool to specify a single
 /// option category to display in the -help output.
-void HideUnrelatedOptions(ArrayRef<cl::OptionCategory *> Categories);
+void HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *> Categories);
 
 } // End namespace cl
 
diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp
index f17d1f6..35c49be 100644
--- a/llvm/lib/Support/CommandLine.cpp
+++ b/llvm/lib/Support/CommandLine.cpp
@@ -1861,7 +1861,7 @@ void cl::HideUnrelatedOptions(cl::OptionCategory &Category) {
   }
 }
 
-void cl::HideUnrelatedOptions(ArrayRef<cl::OptionCategory *> Categories) {
+void cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *> Categories) {
   auto CategoriesBegin = Categories.begin();
   auto CategoriesEnd = Categories.end();
   StringMap<cl::Option *> Options;
diff --git a/llvm/unittests/Support/CommandLineTest.cpp b/llvm/unittests/Support/CommandLineTest.cpp
index 7505593..8e84bd9 100644
--- a/llvm/unittests/Support/CommandLineTest.cpp
+++ b/llvm/unittests/Support/CommandLineTest.cpp
@@ -254,7 +254,8 @@ TEST(CommandLineTest, HideUnrelatedOptionsMulti) {
   cl::opt<int> TestOption2("test-option-2", cl::cat(TestCategory));
   cl::opt<int> TestOption3("test-option-3", cl::cat(TestCategory2));
 
-  cl::OptionCategory *VisibleCategories[] = {&TestCategory, &TestCategory2};
+  const cl::OptionCategory *VisibleCategories[] = {&TestCategory,
+                                                   &TestCategory2};
 
   cl::HideUnrelatedOptions(makeArrayRef(VisibleCategories));
 
-- 
2.7.4