------------------------------------------------------------
revno: 13892
revision-id: squid3@treenet.co.nz-20150820235718-k9ijbnrwujvz8ndn
parent: squid3@treenet.co.nz-20150820135214-l2ecxd125x6u42hu
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4242
author: Pavel Timofeev <timp87@gmail.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Thu 2015-08-20 16:57:18 -0700
message:
  Bug 4242: compile errors with eCAP using clang-3.6
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20150820235718-k9ijbnrwujvz8ndn
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 5343833ffc7fbc44f72e78a03d61bcb8e8be642a
# timestamp: 2015-08-21 00:50:58 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20150820135214-\
#   l2ecxd125x6u42hu
# 
# Begin patch
=== modified file 'src/adaptation/ecap/ServiceRep.cc'
--- src/adaptation/ecap/ServiceRep.cc	2015-01-13 09:13:49 +0000
+++ src/adaptation/ecap/ServiceRep.cc	2015-08-20 23:57:18 +0000
@@ -234,7 +234,7 @@
 
 bool Adaptation::Ecap::ServiceRep::up() const
 {
-    return theService != NULL;
+    return theService;
 }
 
 bool Adaptation::Ecap::ServiceRep::wantsUrl(const String &urlPath) const

=== modified file 'src/adaptation/ecap/XactionRep.cc'
--- src/adaptation/ecap/XactionRep.cc	2015-01-13 09:13:49 +0000
+++ src/adaptation/ecap/XactionRep.cc	2015-08-20 23:57:18 +0000
@@ -72,7 +72,7 @@
 Adaptation::Ecap::XactionRep::master(const AdapterXaction &x)
 {
     Must(!theMaster);
-    Must(x != NULL);
+    Must(x);
     theMaster = x;
 }
 
@@ -259,7 +259,7 @@
     // clear body_pipes, if any
     // this code does not maintain proxying* and canAccessVb states; should it?
 
-    if (theAnswerRep != NULL) {
+    if (theAnswerRep) {
         BodyPipe::Pointer body_pipe = answer().body_pipe;
         if (body_pipe != NULL) {
             Must(body_pipe->stillProducing(this));
@@ -318,7 +318,7 @@
 libecap::Message &
 Adaptation::Ecap::XactionRep::adapted()
 {
-    Must(theAnswerRep != NULL);
+    Must(theAnswerRep);
     return *theAnswerRep;
 }