From ef9ac7a512191d82ad3dc0c2542f700955421f06 Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Fri, 5 Feb 2016 23:05:09 +0000
Subject: [PATCH] Attempt#2 to work around MSVC rejects-valid.

llvm-svn: 259948
---
 llvm/lib/IR/AttributeImpl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/IR/AttributeImpl.h b/llvm/lib/IR/AttributeImpl.h
index f23e958..1b13134 100644
--- a/llvm/lib/IR/AttributeImpl.h
+++ b/llvm/lib/IR/AttributeImpl.h
@@ -171,7 +171,7 @@ class AttributeSetNode final
   void operator=(const AttributeSetNode &) = delete;
   AttributeSetNode(const AttributeSetNode &) = delete;
 public:
-  using TrailingObjects::operator delete;
+  using TrailingObjects<AttributeSetNode, Attribute>::operator delete;
 
   static AttributeSetNode *get(LLVMContext &C, ArrayRef<Attribute> Attrs);
 
@@ -268,7 +268,7 @@ public:
     }
   }
 
-  using TrailingObjects::operator delete;
+  using TrailingObjects<AttributeSetImpl, IndexAttrPair>::operator delete;
 
   /// \brief Get the context that created this AttributeSetImpl.
   LLVMContext &getContext() { return Context; }
-- 
2.7.4