------------------------------------------------------------
revno: 14035
revision-id: squid3@treenet.co.nz-20160420101406-ymt9nyc8gkd3nerv
parent: squid3@treenet.co.nz-20160420063604-j0yzfwew8jtkunkj
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Wed 2016-04-20 22:14:06 +1200
message:
  nullptr is a C++11 feature
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20160420101406-ymt9nyc8gkd3nerv
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 842e5e36cce5e05a7776aad364ec768e3c61ecca
# timestamp: 2016-04-20 10:16:53 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160420063604-\
#   j0yzfwew8jtkunkj
# 
# Begin patch
=== modified file 'src/tests/stub_cbdata.cc'
--- src/tests/stub_cbdata.cc	2016-04-20 03:54:04 +0000
+++ src/tests/stub_cbdata.cc	2016-04-20 10:14:06 +0000
@@ -18,7 +18,7 @@
 }
 void *cbdataInternalFree(void *p, const char *, int) {
     xfree(p);
-    return nullptr;
+    return NULL;
 }
 #if USE_CBDATA_DEBUG
 void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL)