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.

This commit is contained in:
Rudolf Polzer
2016-10-19 15:22:12 -04:00
parent 766c4da7e0
commit 6aa642ef01
+1 -1
View File
@@ -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();