------------------------------------------------------------
revno: 13131
revision-id: squid3@treenet.co.nz-20140502074918-2mfpjgx14tqse6tr
parent: squid3@treenet.co.nz-20140502074732-29lattbxenhwv1uf
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Fri 2014-05-02 00:49:18 -0700
message:
  Resolve 'dying from an unhandled exception: c'
  
  CbcPointer<> is used from code outside of Job protection where it is
  safe to use Must(). In order to get a useful backtrace we need to assert
  immediately at the point of failure. Particularly necessary since these
  are in generic operators used "everywhere" in the code.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140502074918-2mfpjgx14tqse6tr
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 2a162154182611ec842dc8f15dac608cdcc923c1
# timestamp: 2014-05-02 07:53:51 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20140502074732-\
#   29lattbxenhwv1uf
# 
# Begin patch
=== modified file 'src/base/CbcPointer.h'
--- src/base/CbcPointer.h	2012-10-04 11:10:17 +0000
+++ src/base/CbcPointer.h	2014-05-02 07:49:18 +0000
@@ -135,7 +135,7 @@
 CbcPointer<Cbc>::operator *() const
 {
     Cbc *c = get();
-    Must(c);
+    assert(c);
     return *c;
 }
 
@@ -144,7 +144,7 @@
 CbcPointer<Cbc>::operator ->() const
 {
     Cbc *c = get();
-    Must(c);
+    assert(c);
     return c;
 }