From: Zachary Turner <zturner@google.com>
Date: Sat, 12 Nov 2016 00:35:58 +0000 (+0000)
Subject: One more set of changes to fix formatv() on linux.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eced115aace08f41e7a36f2c6d2646d56049b4d6;p=platform%2Fupstream%2Fllvm.git

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

llvm-svn: 286692
---

diff --git a/llvm/include/llvm/Support/FormatVariadic.h b/llvm/include/llvm/Support/FormatVariadic.h
index 1f3ed73..a071fa8 100644
--- a/llvm/include/llvm/Support/FormatVariadic.h
+++ b/llvm/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/llvm/include/llvm/Support/FormatVariadicDetails.h b/llvm/include/llvm/Support/FormatVariadicDetails.h
index daae543..edde6db 100644
--- a/llvm/include/llvm/Support/FormatVariadicDetails.h
+++ b/llvm/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;