From 6aa642ef010fc792d98f40cdb7dd7cb1fcbbfda7 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Wed, 19 Oct 2016 15:22:12 -0400 Subject: [PATCH] Sorry - nullptr doesn't work with the default Makefile and I don't trust the rest of the code to compile with -std=c++11 yet. --- contrib/bobtoolz/DPatch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/bobtoolz/DPatch.cpp b/contrib/bobtoolz/DPatch.cpp index 5916d7e0..be49df4e 100644 --- a/contrib/bobtoolz/DPatch.cpp +++ b/contrib/bobtoolz/DPatch.cpp @@ -302,7 +302,7 @@ DPatch* DPatch::MergePatches( patch_merge_t merge_info, DPatch *p1, DPatch *p2 ) int newHeight = p1->height + p2->height - 1; if ( newHeight > MAX_PATCH_HEIGHT ) { - return nullptr; + return NULL; } DPatch* newPatch = new DPatch(); -- 2.39.2