RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00
Code Issues Projects Releases Wiki Activity

Try to fix build after llvm::formatv() patch.

Browse Source 
llvm-svn: 286686
This commit is contained in:
Zachary Turner 2016-11-12 00:18:42 +00:00
parent 7b6891fa31
commit b7160b3255
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/llvm/Support/FormatAdapters.h
View File

@ -33,10 +33,10 @@ template <typename T> class AlignAdapter : public AdapterBase<T> {
public:
AlignAdapter(T &&Item, AlignStyle Where, size_t Amount)
: AdapterBase(std::forward<T>(Item)), Where(Where), Amount(Amount) {}
: AdapterBase<T>(std::forward<T>(Item)), Where(Where), Amount(Amount) {}
void format(llvm::raw_ostream &Stream, StringRef Style) {
auto Wrapper = detail::build_format_wrapper(std::forward<T>(Item));
auto Wrapper = detail::build_format_wrapper(std::forward<T>(this->Item));
FmtAlign(Wrapper, Where, Amount).format(Stream, Style);
}
};
@ -47,10 +47,10 @@ template <typename T> class PadAdapter : public AdapterBase<T> {
public:
PadAdapter(T &&Item, size_t Left, size_t Right)
: AdapterBase(std::forward<T>(Item)), Left(Left), Right(Right) {}
: AdapterBase<T>(std::forward<T>(Item)), Left(Left), Right(Right) {}
void format(llvm::raw_ostream &Stream, StringRef Style) {
auto Wrapper = detail::build_format_wrapper(std::forward<T>(Item));
auto Wrapper = detail::build_format_wrapper(std::forward<T>(this->Item));
Stream.indent(Left);
Wrapper.format(Stream, Style);
Stream.indent(Right);
@ -62,10 +62,10 @@ template <typename T> class RepeatAdapter : public AdapterBase<T> {
public:
RepeatAdapter(T &&Item, size_t Count)
: AdapterBase(std::forward<T>(Item)), Count(Count) {}
: AdapterBase<T>(std::forward<T>(Item)), Count(Count) {}
void format(llvm::raw_ostream &Stream, StringRef Style) {
auto Wrapper = detail::build_format_wrapper(std::forward<T>(Item));
auto Wrapper = detail::build_format_wrapper(std::forward<T>(this->Item));
for (size_t I = 0; I < Count; ++I) {
Wrapper.format(Stream, Style);
}

2
include/llvm/Support/FormatProviders.h
View File

@ -68,7 +68,7 @@ protected:
Result = None;
} else {
assert(Prec < 100 && "Precision out of range");
Result = std::min(99u, Prec);
Result = std::min<size_t>(99u, Prec);
}
return Result;
}

8
include/llvm/Support/FormatVariadicDetails.h
View File

@ -50,13 +50,7 @@ public:
}
};
template <typename T> class missing_format_wrapper : public format_wrapper {
public:
missing_format_wrapper() {
static_assert(false, "T does not have a format_provider");
}
void format(llvm::raw_ostream &S, StringRef Options) override {}
};
template <typename T> class missing_format_wrapper;
// Test if T is a class that contains a member function with the signature:
//