One more set of changes to fix formatv() on linux.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286692 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/FormatVariadic.h b/include/llvm/Support/FormatVariadic.h
index 1f3ed73edbe080aa33024e386fbdf498f9105302..a071fa8c6857d31ce624927ba457367a662fd806 100644 (file)
--- a/include/llvm/Support/FormatVariadic.h
+++ b/include/llvm/Support/FormatVariadic.h
@@ -124,14 +124,14 @@ public:
     return Result;
   }
 
-  template <size_t N> llvm::SmallString<N> sstr() const {
+  template <unsigned N> llvm::SmallString<N> sstr() const {
     SmallString<N> Result;
     raw_svector_ostream Stream(Result);
     Stream << *this;
     return Result;
   }
 
-  template <size_t N> operator SmallString<N>() const { return sstr<N>(); }
+  template <unsigned N> operator SmallString<N>() const { return sstr<N>(); }
 
   operator std::string() const { return str(); }
 };

diff --git a/include/llvm/Support/FormatVariadicDetails.h b/include/llvm/Support/FormatVariadicDetails.h
index daae5432b26fe5f99240edf1c89922d9998c70db..edde6db162fe116760ed60a5d1fc35e63c3916e4 100644 (file)
--- a/include/llvm/Support/FormatVariadicDetails.h
+++ b/include/llvm/Support/FormatVariadicDetails.h
@@ -22,7 +22,7 @@ namespace detail {
 
 class format_wrapper {
 protected:
-  ~format_wrapper() {}
+  virtual ~format_wrapper() {}
 
 public:
   virtual void format(llvm::raw_ostream &S, StringRef Options) = 0;