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/Bitcode/BitstreamReader.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/Bitcode/BitstreamReader.h')
| -rw-r--r-- | include/llvm/Bitcode/BitstreamReader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/llvm/Bitcode/BitstreamReader.h b/include/llvm/Bitcode/BitstreamReader.h index 6586829440..3daef789d6 100644 --- a/include/llvm/Bitcode/BitstreamReader.h +++ b/include/llvm/Bitcode/BitstreamReader.h @@ -47,9 +47,9 @@ private: /// block/record name information in the BlockInfo block. Only llvm-bcanalyzer /// uses this. bool IgnoreBlockInfoNames; - - BitstreamReader(const BitstreamReader&); // DO NOT IMPLEMENT - void operator=(const BitstreamReader&); // DO NOT IMPLEMENT + + BitstreamReader(const BitstreamReader&) LLVM_DELETED_FUNCTION; + void operator=(const BitstreamReader&) LLVM_DELETED_FUNCTION; public: BitstreamReader() : IgnoreBlockInfoNames(true) { } |