aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWill Dietz <wdietz2@illinois.edu>2013-10-12 21:29:16 +0000
committerWill Dietz <wdietz2@illinois.edu>2013-10-12 21:29:16 +0000
commit6dd7893e8c7234d65cdc47e3f3ce251fdfb35768 (patch)
tree30eda9025a70977ccdc5b8cdf6d3a26c253196aa /tools
parent24732c3363a9a442c14cf236c3de1086cdee6000 (diff)
downloadexternal_llvm-6dd7893e8c7234d65cdc47e3f3ce251fdfb35768.zip
external_llvm-6dd7893e8c7234d65cdc47e3f3ce251fdfb35768.tar.gz
external_llvm-6dd7893e8c7234d65cdc47e3f3ce251fdfb35768.tar.bz2
yaml2coff/elf: Touchup for compatibility.
* std::string::append(int, int) can be ambiguous. * std::vector<>::data() is a C++11 feature, use ArrayRef abstraction. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192542 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r--tools/yaml2obj/yaml2coff.cpp2
-rw-r--r--tools/yaml2obj/yaml2elf.cpp16
2 files changed, 10 insertions, 8 deletions
diff --git a/tools/yaml2obj/yaml2coff.cpp b/tools/yaml2obj/yaml2coff.cpp
index 11aae0e..c757eb6 100644
--- a/tools/yaml2obj/yaml2coff.cpp
+++ b/tools/yaml2obj/yaml2coff.cpp
@@ -32,7 +32,7 @@ struct COFFParser {
COFFParser(COFFYAML::Object &Obj) : Obj(Obj) {
// A COFF string table always starts with a 4 byte size field. Offsets into
// it include this size, so allocate it now.
- StringTable.append(4, 0);
+ StringTable.append(4, char(0));
}
bool parseSections() {
diff --git a/tools/yaml2obj/yaml2elf.cpp b/tools/yaml2obj/yaml2elf.cpp
index d3b25ec..d46e154 100644
--- a/tools/yaml2obj/yaml2elf.cpp
+++ b/tools/yaml2obj/yaml2elf.cpp
@@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//
#include "yaml2obj.h"
+#include "llvm/ADT/ArrayRef.h"
#include "llvm/Object/ELFObjectFile.h"
#include "llvm/Object/ELFYAML.h"
#include "llvm/Support/ELF.h"
@@ -119,13 +120,13 @@ public:
} // end anonymous namespace
template <class T>
-static size_t vectorDataSize(const std::vector<T> &Vec) {
- return Vec.size() * sizeof(T);
+static size_t arrayDataSize(ArrayRef<T> A) {
+ return A.size() * sizeof(T);
}
template <class T>
-static void writeVectorData(raw_ostream &OS, const std::vector<T> &Vec) {
- OS.write((const char *)Vec.data(), vectorDataSize(Vec));
+static void writeArrayData(raw_ostream &OS, ArrayRef<T> A) {
+ OS.write((const char *)A.data(), arrayDataSize(A));
}
template <class T>
@@ -235,8 +236,9 @@ handleSymtabSectionHeader(const ELFYAML::LocalGlobalWeakSymbols &Symbols,
addSymbols(Symbols.Weak, State, Syms, ELF::STB_WEAK);
ContiguousBlobAccumulator &CBA = State.getSectionContentAccum();
- writeVectorData(CBA.getOSAndAlignedOffset(SHeader.sh_offset), Syms);
- SHeader.sh_size = vectorDataSize(Syms);
+ writeArrayData(CBA.getOSAndAlignedOffset(SHeader.sh_offset),
+ makeArrayRef(Syms));
+ SHeader.sh_size = arrayDataSize(makeArrayRef(Syms));
}
template <class ELFT>
@@ -359,7 +361,7 @@ static int writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
SHeaders.push_back(SHStrTabSHeader);
OS.write((const char *)&Header, sizeof(Header));
- writeVectorData(OS, SHeaders);
+ writeArrayData(OS, makeArrayRef(SHeaders));
CBA.writeBlobToStream(OS);
return 0;
}