Object: Get rid of sys::Path, Triple, and cleanup namespace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119309 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h
index 941046c0c580d2bb36be465126f7a79ebd6018ec..ca51581434848999f58bc784b2e6ca1bf6aeac87 100644 (file)
--- 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 29aa4b8bdb81319850709792b667b5445a04099c..c2ab4a5dbbcf19a5d3aacbcc9214b670c0b0e2b5 100644 (file)
--- 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