Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: include/llvm/Bitcode/NaCl/NaClBitcodeBlockDist.h

Issue 1151093004: Changes from 3.7 merge to files not in upstream (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-llvm.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: include/llvm/Bitcode/NaCl/NaClBitcodeBlockDist.h
diff --git a/include/llvm/Bitcode/NaCl/NaClBitcodeBlockDist.h b/include/llvm/Bitcode/NaCl/NaClBitcodeBlockDist.h
index 55a26f6a1595b2974bf4a8fae475b03bd2ab04b9..e74a40564ca82bf808a42321be0c64ea75ce3c93 100644
--- a/include/llvm/Bitcode/NaCl/NaClBitcodeBlockDist.h
+++ b/include/llvm/Bitcode/NaCl/NaClBitcodeBlockDist.h
@@ -21,8 +21,7 @@
namespace llvm {
class NaClBitcodeBlockDistElement : public NaClBitcodeBitsDistElement {
- NaClBitcodeBlockDistElement(const NaClBitcodeBlockDistElement&)
- LLVM_DELETED_FUNCTION;
+ NaClBitcodeBlockDistElement(const NaClBitcodeBlockDistElement&) = delete;
void operator=(const NaClBitcodeBlockDistElement&);
public:
@@ -62,8 +61,8 @@ public:
};
class NaClBitcodeBlockDist : public NaClBitcodeDist {
- NaClBitcodeBlockDist(const NaClBitcodeBlockDist&) LLVM_DELETED_FUNCTION;
- void operator=(const NaClBitcodeBlockDist&) LLVM_DELETED_FUNCTION;
+ NaClBitcodeBlockDist(const NaClBitcodeBlockDist&) = delete;
+ void operator=(const NaClBitcodeBlockDist&) = delete;
public:
static bool classof(const NaClBitcodeDist *Dist) {

Powered by Google App Engine
This is Rietveld 408576698