Revert r132910 and r132909 on behalf of Michael. They didn't build with clang.

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

2 files changed, 0 insertions, 113 deletions

diff --git a/include/llvm/Object/Binary.h b/include/llvm/Object/Binary.h
deleted file mode 100644
index 89cd24bfb9..0000000000
--- a/include/llvm/Object/Binary.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//===- Binary.h - A generic binary file -------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file declares the Binary class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_OBJECT_BINARY_H
-#define LLVM_OBJECT_BINARY_H
-
-#include "llvm/ADT/OwningPtr.h"
-#include "llvm/Object/Error.h"
-
-namespace llvm {
-
-class MemoryBuffer;
-class StringRef;
-
-namespace object {
-
-class Binary {
-private:
-  Binary(); // = delete
-  Binary(const Binary &other); // = delete
-
-  unsigned int TypeID;
-
-protected:
-  MemoryBuffer *Data;
-
-  Binary(unsigned int Type, MemoryBuffer *Source);
-
-  enum {
-    isArchive,
-    isCOFF,
-    isELF,
-    isMachO,
-    isObject
-  };
-
-public:
-  virtual ~Binary();
-
-  StringRef getData() const;
-  StringRef getFileName() const;
-
-  // Cast methods.
-  unsigned int getType() const { return TypeID; }
-  static inline bool classof(Binary const *v) { return true; }
-};
-
-error_code createBinary(MemoryBuffer *Source, OwningPtr<Binary> &Result);
-error_code createBinary(StringRef Path, OwningPtr<Binary> &Result);
-
-}
-}
-
-#endif
diff --git a/include/llvm/Object/Error.h b/include/llvm/Object/Error.h
deleted file mode 100644
index 08f458790f..0000000000
--- a/include/llvm/Object/Error.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- Error.h - system_error extensions for Object -------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This declares a new error_category for the Object library.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_OBJECT_ERROR_H
-#define LLVM_OBJECT_ERROR_H
-
-#include "llvm/Support/system_error.h"
-
-namespace llvm {
-namespace object {
-
-const error_category &object_category();
-
-struct object_error {
-enum _ {
-  success = 0,
-  invalid_file_type,
-  parse_failed
-};
-  _ v_;
-
-  object_error(_ v) : v_(v) {}
-  explicit object_error(int v) : v_(_(v)) {}
-  operator int() const {return v_;}
-};
-
-} // end namespace object.
-
-template <> struct is_error_code_enum<object::object_error> : true_type { };
-
-template <> struct is_error_code_enum<object::object_error::_> : true_type { };
-
-inline error_code make_error_code(object::object_error e) {
-  return error_code(static_cast<int>(e), object::object_category());
-}
-
-} // end namespace llvm.
-
-#endif