diff options
author | Chris Lattner <sabre@nondot.org> | 2008-04-01 18:04:03 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2008-04-01 18:04:03 +0000 |
commit | 6f2ffdb73f9553b3021863bf60ee26bb8c099eb7 (patch) | |
tree | a80cea5404f45341b799001f8ecd061867fdf9e2 /llvm/lib/Linker/Linker.cpp | |
parent | 5db870c90409eebff58ce199ea625d880eb10b20 (diff) | |
download | bcm5719-llvm-6f2ffdb73f9553b3021863bf60ee26bb8c099eb7.tar.gz bcm5719-llvm-6f2ffdb73f9553b3021863bf60ee26bb8c099eb7.zip |
Change the MemoryBuffer::getFile* methods to take just a pointer to the
start of a filename, not a filename+length. All clients can produce a
null terminated name, and the system api's require null terminated
strings anyway.
llvm-svn: 49041
Diffstat (limited to 'llvm/lib/Linker/Linker.cpp')
-rw-r--r-- | llvm/lib/Linker/Linker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Linker/Linker.cpp b/llvm/lib/Linker/Linker.cpp index 64327e143ba..ef242e5c798 100644 --- a/llvm/lib/Linker/Linker.cpp +++ b/llvm/lib/Linker/Linker.cpp @@ -19,7 +19,8 @@ #include "llvm/Support/Streams.h" using namespace llvm; -Linker::Linker(const std::string& progname, const std::string& modname, unsigned flags) +Linker::Linker(const std::string& progname, const std::string& modname, + unsigned flags) : Composite(0) , LibPaths() , Flags(flags) @@ -103,8 +104,7 @@ Linker::LoadObject(const sys::Path &FN) { Module *Result = 0; const std::string &FNS = FN.toString(); - std::auto_ptr<MemoryBuffer> Buffer( - MemoryBuffer::getFileOrSTDIN(&FNS[0], FNS.size())); + std::auto_ptr<MemoryBuffer> Buffer(MemoryBuffer::getFileOrSTDIN(FNS.c_str())); if (Buffer.get()) Result = ParseBitcodeFile(Buffer.get(), &ParseErrorMessage); else |