diff options
-rw-r--r-- | include/llvm/Object/ObjectFile.h | 9 | ||||
-rw-r--r-- | lib/Object/ObjectFile.cpp | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h index 941046c0c5..ca51581434 100644 --- a/include/llvm/Object/ObjectFile.h +++ b/include/llvm/Object/ObjectFile.h @@ -14,12 +14,13 @@ #ifndef LLVM_OBJECT_OBJECT_FILE_H #define LLVM_OBJECT_OBJECT_FILE_H -#include "llvm/ADT/Triple.h" -#include "llvm/System/Path.h" +#include "llvm/ADT/StringRef.h" +#include "llvm/System/DataTypes.h" namespace llvm { class MemoryBuffer; +class StringRef; namespace object { @@ -155,7 +156,7 @@ public: virtual uint8_t getBytesInAddress() const = 0; virtual StringRef getFileFormatName() const = 0; - virtual Triple::ArchType getArch() const = 0; + virtual /* Triple::ArchType */ unsigned getArch() const = 0; StringRef getFilename() const; @@ -163,7 +164,7 @@ public: /// @param ObjectPath The path to the object file. ObjectPath.isObject must /// return true. /// @brief Create ObjectFile from path. - static ObjectFile *createObjectFile(const sys::Path &ObjectPath); + static ObjectFile *createObjectFile(StringRef ObjectPath); static ObjectFile *createObjectFile(MemoryBuffer *Object); private: diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index 29aa4b8bdb..c2ab4a5dbb 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -14,9 +14,10 @@ #include "llvm/Object/ObjectFile.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryBuffer.h" +#include "llvm/System/Path.h" -namespace llvm { -namespace object { +using namespace llvm; +using namespace object; ObjectFile::ObjectFile(MemoryBuffer *Object) : MapFile(Object) { @@ -60,9 +61,6 @@ ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) { } } -ObjectFile *ObjectFile::createObjectFile(const sys::Path &ObjectPath) { - return createObjectFile(MemoryBuffer::getFile(ObjectPath.c_str())); +ObjectFile *ObjectFile::createObjectFile(StringRef ObjectPath) { + return createObjectFile(MemoryBuffer::getFile(ObjectPath)); } - -} // end namespace object -} // end namespace llvm |