summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-link
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2014-04-25 04:24:47 +0000
committerCraig Topper <craig.topper@gmail.com>2014-04-25 04:24:47 +0000
commite6cb63e471c56fa7e90916ec81da76a2604e388f (patch)
treed28cb6c8432d2e14d395d098272faa726a0cd01b /llvm/tools/llvm-link
parent409ac186bb7724c93d76db93b17ad6b1fdeea234 (diff)
downloadbcm5719-llvm-e6cb63e471c56fa7e90916ec81da76a2604e388f.tar.gz
bcm5719-llvm-e6cb63e471c56fa7e90916ec81da76a2604e388f.zip
[C++] Use 'nullptr'. Tools edition.
llvm-svn: 207176
Diffstat (limited to 'llvm/tools/llvm-link')
-rw-r--r--llvm/tools/llvm-link/llvm-link.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp
index 1f0e2246ce8..a756a1c33a2 100644
--- a/llvm/tools/llvm-link/llvm-link.cpp
+++ b/llvm/tools/llvm-link/llvm-link.cpp
@@ -61,13 +61,13 @@ static inline Module *LoadFile(const char *argv0, const std::string &FN,
LLVMContext& Context) {
SMDiagnostic Err;
if (Verbose) errs() << "Loading '" << FN << "'\n";
- Module* Result = 0;
+ Module* Result = nullptr;
Result = ParseIRFile(FN, Err, Context);
if (Result) return Result; // Load successful!
Err.print(argv0, errs());
- return NULL;
+ return nullptr;
}
int main(int argc, char **argv) {
@@ -84,7 +84,7 @@ int main(int argc, char **argv) {
std::unique_ptr<Module> Composite(
LoadFile(argv[0], InputFilenames[BaseArg], Context));
- if (Composite.get() == 0) {
+ if (!Composite.get()) {
errs() << argv[0] << ": error loading file '"
<< InputFilenames[BaseArg] << "'\n";
return 1;
@@ -93,7 +93,7 @@ int main(int argc, char **argv) {
Linker L(Composite.get(), SuppressWarnings);
for (unsigned i = BaseArg+1; i < InputFilenames.size(); ++i) {
std::unique_ptr<Module> M(LoadFile(argv[0], InputFilenames[i], Context));
- if (M.get() == 0) {
+ if (!M.get()) {
errs() << argv[0] << ": error loading file '" <<InputFilenames[i]<< "'\n";
return 1;
}
OpenPOWER on IntegriCloud