------------------------------------------------------------
revno: 13905
revision-id: squid3@treenet.co.nz-20150901184041-3bg3q9xk95ruzsl8
parent: squid3@treenet.co.nz-20150901092557-520gvjurni9xv4nr
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Tue 2015-09-01 11:40:41 -0700
message:
  Fix FreeBSD Clang-3.5 build error
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150901184041-3bg3q9xk95ruzsl8
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 1dffefb1e6ff2f31fa18a78d15f4a1f100d8b21d
# timestamp: 2015-09-01 18:50:58 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150901092557-\
#   520gvjurni9xv4nr
# 
# Begin patch
=== modified file 'src/clients/Client.cc'
--- src/clients/Client.cc	2015-08-29 20:11:19 +0000
+++ src/clients/Client.cc	2015-09-01 18:40:41 +0000
@@ -800,7 +800,7 @@
     if (abortOnBadEntry("entry went bad while waiting for the now-aborted adapted body"))
         return;
 
-    Must(adaptedBodySource != nullptr);
+    Must(adaptedBodySource != NULL);
     if (!adaptedBodySource->exhausted()) {
         debugs(11,5, "waiting to consume the remainder of the aborted adapted body");
         return; // resumeBodyStorage() should eventually consume the rest