summaryrefslogtreecommitdiff
path: root/lib/Linker
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-04-01 18:04:03 +0000
committerChris Lattner <sabre@nondot.org>2008-04-01 18:04:03 +0000
commit038112a4e0a9afd656f415ab397a230ae5921627 (patch)
tree1e533932de12cd50bf288f55438475ed736bdce8 /lib/Linker
parent8eedc9ee2ca3bb489957de68e3f907c88ca39efc (diff)
downloadllvm-038112a4e0a9afd656f415ab397a230ae5921627.tar.gz
llvm-038112a4e0a9afd656f415ab397a230ae5921627.tar.bz2
llvm-038112a4e0a9afd656f415ab397a230ae5921627.tar.xz
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49041 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker')
-rw-r--r--lib/Linker/Linker.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp
index 64327e143b..ef242e5c79 100644
--- a/lib/Linker/Linker.cpp
+++ b/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