]>
Commit | Line | Data |
---|---|---|
198c3926 MF |
1 | ------------------------------------------------------------ |
2 | revno: 13234 | |
3 | revision-id: squid3@treenet.co.nz-20160420101437-36eofkldxfku61kj | |
4 | parent: squid3@treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11 | |
5 | committer: Amos Jeffries <squid3@treenet.co.nz> | |
6 | branch nick: 3.4 | |
7 | timestamp: Wed 2016-04-20 22:14:37 +1200 | |
8 | message: | |
9 | nullptr is a C++11 feature | |
10 | ------------------------------------------------------------ | |
11 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
12 | # revision_id: squid3@treenet.co.nz-20160420101437-36eofkldxfku61kj | |
13 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 | |
14 | # testament_sha1: 0f9f2a5b29a7ef02befe2a4e2e6357ef4bcffbce | |
15 | # timestamp: 2016-04-20 10:51:03 +0000 | |
16 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 | |
17 | # base_revision_id: squid3@treenet.co.nz-20160420063907-\ | |
18 | # hcnf4qmcg5hbjc11 | |
19 | # | |
20 | # Begin patch | |
21 | === modified file 'src/tests/stub_cbdata.cc' | |
22 | --- src/tests/stub_cbdata.cc 2016-04-20 06:39:07 +0000 | |
23 | +++ src/tests/stub_cbdata.cc 2016-04-20 10:14:37 +0000 | |
24 | @@ -10,7 +10,7 @@ | |
25 | } | |
26 | void *cbdataInternalFree(void *p, const char *, int) { | |
27 | xfree(p); | |
28 | - return nullptr; | |
29 | + return NULL; | |
30 | } | |
31 | #if USE_CBDATA_DEBUG | |
32 | void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL) | |
33 |