diff options
| author | karpinski <marcinpkarpinski@gmail.com> | 2016-12-30 13:21:21 +0100 |
|---|---|---|
| committer | karpinski <marcinpkarpinski@gmail.com> | 2016-12-30 16:37:05 +0100 |
| commit | 72ebc02f13eeb7328d199d7d5ccaee4e5ff03b3e (patch) | |
| tree | 21add101437bccbb0591ed6e2382f11752a8d992 /src/rustllvm/RustWrapper.cpp | |
| parent | c72d859e4f27c4b4c4be349091f5c71058ac1cd4 (diff) | |
| download | rust-72ebc02f13eeb7328d199d7d5ccaee4e5ff03b3e.tar.gz rust-72ebc02f13eeb7328d199d7d5ccaee4e5ff03b3e.zip | |
Switching from NULL to nullptr in src/rustllvm.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 89d9d46dfb3..8f635441167 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -66,7 +66,7 @@ LLVMRustCreateMemoryBufferWithContentsOfFile(const char *Path) { extern "C" char *LLVMRustGetLastError(void) { char *ret = LastError; - LastError = NULL; + LastError = nullptr; return ret; } @@ -319,7 +319,7 @@ inline Metadata **unwrap(LLVMRustMetadataRef *Vals) { } template <typename DIT> DIT *unwrapDIptr(LLVMRustMetadataRef ref) { - return (DIT *)(ref ? unwrap<MDNode>(ref) : NULL); + return (DIT *)(ref ? unwrap<MDNode>(ref) : nullptr); } #define DIDescriptor DIScope @@ -574,7 +574,7 @@ extern "C" LLVMRustMetadataRef LLVMRustDIBuilderCreateStaticVariable( LLVMRustDIBuilderRef Builder, LLVMRustMetadataRef Context, const char *Name, const char *LinkageName, LLVMRustMetadataRef File, unsigned LineNo, LLVMRustMetadataRef Ty, bool isLocalToUnit, LLVMValueRef Val, - LLVMRustMetadataRef Decl = NULL, uint64_t AlignInBits = 0) { + LLVMRustMetadataRef Decl = nullptr, uint64_t AlignInBits = 0) { Constant *InitVal = cast<Constant>(unwrap(Val)); #if LLVM_VERSION_GE(4, 0) @@ -1012,14 +1012,14 @@ extern "C" LLVMValueRef LLVMRustBuildCleanupPad(LLVMBuilderRef Builder, const char *Name) { #if LLVM_VERSION_GE(3, 8) Value **Args = unwrap(LLArgs); - if (ParentPad == NULL) { + if (ParentPad == nullptr) { Type *Ty = Type::getTokenTy(unwrap(Builder)->getContext()); ParentPad = wrap(Constant::getNullValue(Ty)); } return wrap(unwrap(Builder)->CreateCleanupPad( unwrap(ParentPad), ArrayRef<Value *>(Args, ArgCnt), Name)); #else - return NULL; + return nullptr; #endif } @@ -1030,7 +1030,7 @@ extern "C" LLVMValueRef LLVMRustBuildCleanupRet(LLVMBuilderRef Builder, CleanupPadInst *Inst = cast<CleanupPadInst>(unwrap(CleanupPad)); return wrap(unwrap(Builder)->CreateCleanupRet(Inst, unwrap(UnwindBB))); #else - return NULL; + return nullptr; #endif } @@ -1042,7 +1042,7 @@ LLVMRustBuildCatchPad(LLVMBuilderRef Builder, LLVMValueRef ParentPad, return wrap(unwrap(Builder)->CreateCatchPad( unwrap(ParentPad), ArrayRef<Value *>(Args, ArgCnt), Name)); #else - return NULL; + return nullptr; #endif } @@ -1053,7 +1053,7 @@ extern "C" LLVMValueRef LLVMRustBuildCatchRet(LLVMBuilderRef Builder, return wrap(unwrap(Builder)->CreateCatchRet(cast<CatchPadInst>(unwrap(Pad)), unwrap(BB))); #else - return NULL; + return nullptr; #endif } @@ -1063,14 +1063,14 @@ extern "C" LLVMValueRef LLVMRustBuildCatchSwitch(LLVMBuilderRef Builder, unsigned NumHandlers, const char *Name) { #if LLVM_VERSION_GE(3, 8) - if (ParentPad == NULL) { + if (ParentPad == nullptr) { Type *Ty = Type::getTokenTy(unwrap(Builder)->getContext()); ParentPad = wrap(Constant::getNullValue(Ty)); } return wrap(unwrap(Builder)->CreateCatchSwitch(unwrap(ParentPad), unwrap(BB), NumHandlers, Name)); #else - return NULL; + return nullptr; #endif } @@ -1126,7 +1126,7 @@ LLVMRustBuildInvoke(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args, extern "C" void *LLVMRustBuildOperandBundleDef(const char *Name, LLVMValueRef *Inputs, unsigned NumInputs) { - return NULL; + return nullptr; } extern "C" void LLVMRustFreeOperandBundleDef(void *Bundle) {} |
