diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-09-25 17:30:25 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-09-25 18:01:23 -0700 |
| commit | a27c28b1427dc2082ab2b31efdbb25f9fde31b61 (patch) | |
| tree | 6f3ff025f542ca3f66a1a01cbf239aeef7784511 /include/llvm/Support/MemoryBuffer.h | |
| parent | 0e15ffd8cb1ec642eddb96380660914ff2b007e1 (diff) | |
| parent | bc4021f31eaa97ee52655828da3e3de14a39e4a6 (diff) | |
Merge commit 'bc4021f31eaa97ee52655828da3e3de14a39e4a6'
Conflicts:
lib/MC/MCAssembler.cpp
lib/Target/ARM/ARMISelDAGToDAG.cpp
lib/Target/Mips/MipsInstrFPU.td
lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp
lib/Target/X86/X86ISelLowering.h
Diffstat (limited to 'include/llvm/Support/MemoryBuffer.h')
| -rw-r--r-- | include/llvm/Support/MemoryBuffer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/llvm/Support/MemoryBuffer.h b/include/llvm/Support/MemoryBuffer.h index 06816de971..1f02907d9f 100644 --- a/include/llvm/Support/MemoryBuffer.h +++ b/include/llvm/Support/MemoryBuffer.h @@ -15,6 +15,7 @@ #define LLVM_SUPPORT_MEMORYBUFFER_H #include "llvm/ADT/StringRef.h" +#include "llvm/Support/Compiler.h" #include "llvm/Support/DataTypes.h" namespace llvm { @@ -36,8 +37,8 @@ class MemoryBuffer { const char *BufferStart; // Start of the buffer. const char *BufferEnd; // End of the buffer. - MemoryBuffer(const MemoryBuffer &); // DO NOT IMPLEMENT - MemoryBuffer &operator=(const MemoryBuffer &); // DO NOT IMPLEMENT + MemoryBuffer(const MemoryBuffer &) LLVM_DELETED_FUNCTION; + MemoryBuffer &operator=(const MemoryBuffer &) LLVM_DELETED_FUNCTION; protected: MemoryBuffer() {} void init(const char *BufStart, const char *BufEnd, |