diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-11-13 18:04:43 -0800 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-11-13 18:04:43 -0800 |
| commit | 5bf33de8c8e5cb8dff4f29919f434f3b453007af (patch) | |
| tree | 2025e3de9ff733f328d0e539f56ddb5e42c5f2c5 /include/llvm/Support | |
| parent | c58bc8e4e567fa86383d3e5da8613f49e39104b6 (diff) | |
| parent | be02a90de17f857ba65bbd8a11653ca1bad30adc (diff) | |
Merge commit 'be02a90de17f857ba65bbd8a11653ca1bad30adc'
Conflicts:
lib/Target/Mips/MipsISelLowering.cpp
lib/Target/X86/X86ISelLowering.cpp
lib/Target/X86/X86InstrFormats.td
Diffstat (limited to 'include/llvm/Support')
| -rw-r--r-- | include/llvm/Support/DataExtractor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/llvm/Support/DataExtractor.h b/include/llvm/Support/DataExtractor.h index 8d880fd5e8..a3ae782040 100644 --- a/include/llvm/Support/DataExtractor.h +++ b/include/llvm/Support/DataExtractor.h @@ -10,6 +10,7 @@ #ifndef LLVM_SUPPORT_DATAEXTRACTOR_H #define LLVM_SUPPORT_DATAEXTRACTOR_H +#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/DataTypes.h" |