summaryrefslogtreecommitdiffstats
path: root/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2013-11-05 01:37:40 +0000
committerRui Ueyama <ruiu@google.com>2013-11-05 01:37:40 +0000
commitc1800beb559c92ba4a22c62b5171ad54ac5f3b6c (patch)
tree73f15e06d98d55f2a3f12a46764b3a546406bb7e /lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
parent1c8c3fe4b4705601a48dc126520ed9c355f9e956 (diff)
downloadbcm5719-llvm-c1800beb559c92ba4a22c62b5171ad54ac5f3b6c.tar.gz
bcm5719-llvm-c1800beb559c92ba4a22c62b5171ad54ac5f3b6c.zip
Remove unnecessary namespace qualifier.
llvm-svn: 194037
Diffstat (limited to 'lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp')
-rw-r--r--lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
index 7e5e1ab2094..8a7eb4c5296 100644
--- a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
+++ b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
@@ -90,7 +90,7 @@ public:
std::string storage;
llvm::raw_string_ostream buffer(storage);
buffer << llvm::format("L%03d", _unnamedCounter++);
- llvm::StringRef newName = copyString(buffer.str());
+ StringRef newName = copyString(buffer.str());
_refNames[target] = newName;
DEBUG_WITH_TYPE("WriterYAML",
llvm::dbgs() << "unnamed atom: creating ref-name: '"
@@ -119,7 +119,7 @@ public:
std::string Storage;
llvm::raw_string_ostream buffer(Storage);
buffer << atom.name() << llvm::format(".%03d", ++_collisionCount);
- llvm::StringRef newName = copyString(buffer.str());
+ StringRef newName = copyString(buffer.str());
_refNames[&atom] = newName;
DEBUG_WITH_TYPE("WriterYAML",
llvm::dbgs() << "name collsion: creating ref-name: '"
@@ -132,7 +132,7 @@ public:
std::string Storage2;
llvm::raw_string_ostream buffer2(Storage2);
buffer2 << prevAtom->name() << llvm::format(".%03d", ++_collisionCount);
- llvm::StringRef newName2 = copyString(buffer2.str());
+ StringRef newName2 = copyString(buffer2.str());
_refNames[prevAtom] = newName2;
DEBUG_WITH_TYPE("WriterYAML",
llvm::dbgs() << "name collsion: creating ref-name: '"
@@ -153,7 +153,7 @@ public:
bool hasRefName(const lld::Atom *atom) { return _refNames.count(atom); }
- llvm::StringRef refName(const lld::Atom *atom) {
+ StringRef refName(const lld::Atom *atom) {
return _refNames.find(atom)->second;
}
@@ -163,13 +163,13 @@ private:
// Allocate a new copy of this string and keep track of allocations
// in _stringCopies, so they can be freed when RefNameBuilder is destroyed.
- llvm::StringRef copyString(llvm::StringRef str) {
+ StringRef copyString(StringRef str) {
// We want _stringCopies to own the string memory so it is deallocated
// when the File object is destroyed. But we need a StringRef that
// points into that memory.
std::unique_ptr<char[]> s(new char[str.size()]);
memcpy(s.get(), str.data(), str.size());
- llvm::StringRef r = llvm::StringRef(s.get(), str.size());
+ StringRef r = StringRef(s.get(), str.size());
_stringCopies.push_back(std::move(s));
return r;
}
@@ -187,12 +187,12 @@ class RefNameResolver {
public:
RefNameResolver(const lld::File *file, IO &io);
- const lld::Atom *lookup(llvm::StringRef name) const {
+ const lld::Atom *lookup(StringRef name) const {
NameToAtom::const_iterator pos = _nameMap.find(name);
if (pos != _nameMap.end()) {
return pos->second;
} else {
- _io.setError(llvm::Twine("no such atom name: ") + name);
+ _io.setError(Twine("no such atom name: ") + name);
return nullptr;
}
}
@@ -200,9 +200,9 @@ public:
private:
typedef llvm::StringMap<const lld::Atom *> NameToAtom;
- void add(llvm::StringRef name, const lld::Atom *atom) {
+ void add(StringRef name, const lld::Atom *atom) {
if (_nameMap.count(name)) {
- _io.setError(llvm::Twine("duplicate atom name: ") + name);
+ _io.setError(Twine("duplicate atom name: ") + name);
} else {
_nameMap[name] = atom;
}
@@ -248,7 +248,7 @@ enum FileKinds {
struct ArchMember {
FileKinds _kind;
- llvm::StringRef _name;
+ StringRef _name;
const lld::File *_content;
};
@@ -276,7 +276,7 @@ namespace yaml {
// This is a custom formatter for RefKind
template <> struct ScalarTraits<RefKind> {
- static void output(const RefKind &value, void *ctxt, llvm::raw_ostream &out) {
+ static void output(const RefKind &value, void *ctxt, raw_ostream &out) {
assert(ctxt != nullptr);
ContextInfo *info = reinterpret_cast<ContextInfo *>(ctxt);
switch (value) {
@@ -486,7 +486,7 @@ struct ScalarEnumerationTraits<lld::SharedLibraryAtom::Type> {
/// 7 mod 2^4 # 16-byte aligned plus 7 bytes
template <> struct ScalarTraits<lld::DefinedAtom::Alignment> {
static void output(const lld::DefinedAtom::Alignment &value, void *ctxt,
- llvm::raw_ostream &out) {
+ raw_ostream &out) {
if (value.modulus == 0) {
out << llvm::format("2^%d", value.powerOf2);
} else {
@@ -555,12 +555,12 @@ template <typename T> struct SequenceTraits<AtomList<T> > {
// Used to allow DefinedAtom content bytes to be a flow sequence of
// two-digit hex numbers without the leading 0x (e.g. FF, 04, 0A)
template <> struct ScalarTraits<ImplicitHex8> {
- static void output(const ImplicitHex8 &val, void *, llvm::raw_ostream &out) {
+ static void output(const ImplicitHex8 &val, void *, raw_ostream &out) {
uint8_t num = val;
out << llvm::format("%02X", num);
}
- static llvm::StringRef input(llvm::StringRef str, void *, ImplicitHex8 &val) {
+ static StringRef input(StringRef str, void *, ImplicitHex8 &val) {
unsigned long long n;
if (getAsUnsignedInteger(str, 16, n))
return "invalid two-digit-hex number";
@@ -681,7 +681,7 @@ template <> struct MappingTraits<const lld::File *> {
// points into that memory.
std::unique_ptr<char[]> s(new char[str.size()]);
memcpy(s.get(), str.data(), str.size());
- llvm::StringRef r = llvm::StringRef(s.get(), str.size());
+ StringRef r = StringRef(s.get(), str.size());
_stringCopies.push_back(std::move(s));
return r;
}
@@ -1211,11 +1211,11 @@ inline void MappingTraits<const lld::Reference *>::NormalizedReference::bind(
_target = resolver.lookup(_targetName);
}
-inline llvm::StringRef
+inline StringRef
MappingTraits<const lld::Reference *>::NormalizedReference::targetName(
IO &io, const lld::Reference *ref) {
if (ref->target() == nullptr)
- return llvm::StringRef();
+ return StringRef();
ContextInfo *info = reinterpret_cast<ContextInfo *>(io.getContext());
assert(info != nullptr);
typedef MappingTraits<const lld::File *>::NormalizedFile NormalizedFile;
OpenPOWER on IntegriCloud