Forward port to llvm-3.5 (cip)

[frida/frida.git] / src / disassembler / Disassembler.cxx

diff --git a/src/disassembler/Disassembler.cxx b/src/disassembler/Disassembler.cxx
index babac8249a79fb9f01d66a37c1822ba8494f5885..7422df561784966652b8f7e69ebb276019f2e0ea 100644 (file)
--- a/src/disassembler/Disassembler.cxx
+++ b/src/disassembler/Disassembler.cxx
@@ -1,17 +1,11 @@
 #include "Disassembler.hxx"
 
-namespace {
-    llvm::OwningPtr<llvm::object::Binary>&
-    constructor_helper(const std::string& filename,
-                       llvm::OwningPtr<llvm::object::Binary>& binary) {
-        createBinary(filename, binary);
-        return binary;
-    }
-}
-
+using namespace llvm;
+using namespace llvm::object;
 
 Disassembler::Disassembler(const std::string& filename) 
-    : _target(constructor_helper(filename, _binary))
+       : _binary(createBinary(filename).get())
+       , _target(_binary)
 {
     
 }