Remove the bitwise assignment OR operator from the Attributes class. Replace it with...

[oota-llvm.git] / include / llvm / Attributes.h

diff --git a/include/llvm/Attributes.h b/include/llvm/Attributes.h
index 268fc5a8e1cd68a3225102118fdb37297a37b1c3..08cfb86898c9e45305876f7702ca3638387da64b 100644 (file)
--- a/include/llvm/Attributes.h
+++ b/include/llvm/Attributes.h
@@ -236,7 +236,6 @@ public:
   }
 
   Attributes operator & (const Attributes &A) const;
-  Attributes &operator |= (const Attributes &A);
   Attributes &operator &= (const Attributes &A);
 
   uint64_t Raw() const;
@@ -351,7 +350,7 @@ public:
   /// addAttr - Add the specified attribute at the specified index to this
   /// attribute list.  Since attribute lists are immutable, this
   /// returns the new list.
-  AttrListPtr addAttr(unsigned Idx, Attributes Attrs) const;
+  AttrListPtr addAttr(LLVMContext &C, unsigned Idx, Attributes Attrs) const;
 
   /// removeAttr - Remove the specified attribute at the specified index from
   /// this attribute list.  Since attribute lists are immutable, this