From 0361798dbeb6ead0a79ab7985f02da347fce988e Mon Sep 17 00:00:00 2001
From: Nathan James <n.james93@hotmail.co.uk>
Date: Tue, 7 Apr 2020 21:30:29 +0100
Subject: [PATCH] [clang-tidy] Fix buildbot failing with explicit
 specialization in class scope

---
 clang-tools-extra/clang-tidy/ClangTidyCheck.h | 76 +++++++++++++++------------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/clang-tools-extra/clang-tidy/ClangTidyCheck.h b/clang-tools-extra/clang-tidy/ClangTidyCheck.h
index e90e92f..84438c2 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyCheck.h
+++ b/clang-tools-extra/clang-tidy/ClangTidyCheck.h
@@ -312,41 +312,6 @@ public:
       return Default;
     }
 
-    /// Read a named option from the ``Context`` and parse it as a bool.
-    ///
-    /// Reads the option with the check-local name \p LocalName from the
-    /// ``CheckOptions``. If the corresponding key is not present, returns
-    /// a ``MissingOptionError``. If the corresponding key can't be parsed as
-    /// a bool, return an ``UnparseableIntegerOptionError``.
-    template <> llvm::Expected<bool> get<bool>(StringRef LocalName) const;
-
-    /// Read a named option from the ``Context`` and parse it as a bool.
-    ///
-    /// Reads the option with the check-local name \p LocalName from the
-    /// ``CheckOptions``. If the corresponding key is not present or it can't be
-    /// parsed as a bool, returns \p Default.
-    template <> bool get<bool>(StringRef LocalName, bool Default) const;
-
-    /// Read a named option from the ``Context`` and parse it as a bool.
-    ///
-    /// Reads the option with the check-local name \p LocalName from local or
-    /// global ``CheckOptions``. Gets local option first. If local is not
-    /// present, falls back to get global option. If global option is not
-    /// present either, returns a ``MissingOptionError``. If the corresponding
-    /// key can't be parsed as a bool, return an
-    /// ``UnparseableIntegerOptionError``.
-    template <>
-    llvm::Expected<bool> getLocalOrGlobal<bool>(StringRef LocalName) const;
-
-    /// Read a named option from the ``Context`` and parse it as a bool.
-    ///
-    /// Reads the option with the check-local name \p LocalName from local or
-    /// global ``CheckOptions``. Gets local option first. If local is not
-    /// present, falls back to get global option. If global option is not
-    /// present either or it can't be parsed as a bool, returns \p Default.
-    template <>
-    bool getLocalOrGlobal<bool>(StringRef LocalName, bool Default) const;
-
     /// Read a named option from the ``Context`` and parse it as an
     /// enum type ``T`` using the \p Mapping provided. If \p IgnoreCase is set,
     /// it will search the mapping ignoring the case.
@@ -488,6 +453,47 @@ protected:
   const LangOptions &getLangOpts() const { return Context->getLangOpts(); }
 };
 
+/// Read a named option from the ``Context`` and parse it as a bool.
+///
+/// Reads the option with the check-local name \p LocalName from the
+/// ``CheckOptions``. If the corresponding key is not present, returns
+/// a ``MissingOptionError``. If the corresponding key can't be parsed as
+/// a bool, return an ``UnparseableIntegerOptionError``.
+template <>
+llvm::Expected<bool>
+ClangTidyCheck::OptionsView::get<bool>(StringRef LocalName) const;
+
+/// Read a named option from the ``Context`` and parse it as a bool.
+///
+/// Reads the option with the check-local name \p LocalName from the
+/// ``CheckOptions``. If the corresponding key is not present or it can't be
+/// parsed as a bool, returns \p Default.
+template <>
+bool ClangTidyCheck::OptionsView::get<bool>(StringRef LocalName,
+                                            bool Default) const;
+
+/// Read a named option from the ``Context`` and parse it as a bool.
+///
+/// Reads the option with the check-local name \p LocalName from local or
+/// global ``CheckOptions``. Gets local option first. If local is not
+/// present, falls back to get global option. If global option is not
+/// present either, returns a ``MissingOptionError``. If the corresponding
+/// key can't be parsed as a bool, return an
+/// ``UnparseableIntegerOptionError``.
+template <>
+llvm::Expected<bool>
+ClangTidyCheck::OptionsView::getLocalOrGlobal<bool>(StringRef LocalName) const;
+
+/// Read a named option from the ``Context`` and parse it as a bool.
+///
+/// Reads the option with the check-local name \p LocalName from local or
+/// global ``CheckOptions``. Gets local option first. If local is not
+/// present, falls back to get global option. If global option is not
+/// present either or it can't be parsed as a bool, returns \p Default.
+template <>
+bool ClangTidyCheck::OptionsView::getLocalOrGlobal<bool>(StringRef LocalName,
+                                                         bool Default) const;
+
 } // namespace tidy
 } // namespace clang
 
-- 
2.7.4