From 563296abd8a1b2a9f2cd6675094ea448d0adbf1f Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Wed, 25 Apr 2018 23:50:55 +0000 Subject: [PATCH] Switch to Clang's isDigit function. std::isdigit can be overloaded, causing the template deduction to fail. Use Clang's isDigit function which to avoid this. Switch the other calls for consistency. llvm-svn: 330887 --- clang/lib/Driver/ToolChains/Arch/RISCV.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp index 4f0ddd6..9e675bd 100644 --- a/clang/lib/Driver/ToolChains/Arch/RISCV.cpp +++ b/clang/lib/Driver/ToolChains/Arch/RISCV.cpp @@ -8,13 +8,13 @@ //===----------------------------------------------------------------------===// #include "RISCV.h" +#include "clang/Basic/CharInfo.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/Options.h" #include "llvm/Option/ArgList.h" #include "llvm/Support/TargetParser.h" #include "llvm/Support/raw_ostream.h" -#include using namespace clang::driver; using namespace clang::driver::tools; @@ -57,7 +57,7 @@ static bool getExtensionVersion(const Driver &D, StringRef MArch, auto I = In.begin(); auto E = In.end(); - while (I != E && isdigit(*I)) + while (I != E && isDigit(*I)) Major.append(1, *I++); if (Major.empty()) @@ -66,7 +66,7 @@ static bool getExtensionVersion(const Driver &D, StringRef MArch, if (I != E && *I == 'p') { ++I; - while (I != E && isdigit(*I)) + while (I != E && isDigit(*I)) Minor.append(1, *I++); // Expected 'p' to be followed by minor version number. @@ -161,7 +161,7 @@ static void getExtensionFeatures(const Driver &D, } std::string Major, Minor; - auto Pos = Name.find_if(std::isdigit); + auto Pos = Name.find_if(isDigit); if (Pos != StringRef::npos) { auto Next = Name.substr(Pos); Name = Name.substr(0, Pos); -- 2.7.4