| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 660fce9cfa00a57e5b7cec46116a31e21595c306 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 19 Jun 2017 23:47:01 -0700 |
| 4 | Subject: [PATCH] squid: Upgrade to 3.5.26 |
| 5 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 6 | ../../squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc: In function 'void squidaio_init()': ../../squid-3.5.26/src/DiskIO/DiskThreads/DiskThreads.h:30:50: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] #define NUMTHREADS (Config.cacheSwap.n_configured*16) |
| 7 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 8 | Upstream-Status: Backport |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 9 | |
| 10 | --- |
| 11 | src/DiskIO/DiskThreads/aiops.cc | 2 +- |
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 | |
| 14 | diff --git a/src/DiskIO/DiskThreads/aiops.cc b/src/DiskIO/DiskThreads/aiops.cc |
| 15 | index b44adfa..e11f948 100644 |
| 16 | --- a/src/DiskIO/DiskThreads/aiops.cc |
| 17 | +++ b/src/DiskIO/DiskThreads/aiops.cc |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 18 | @@ -290,7 +290,7 @@ squidaio_init(void) |
| 19 | /* Create threads and get them to sit in their wait loop */ |
| 20 | squidaio_thread_pool = memPoolCreate("aio_thread", sizeof(squidaio_thread_t)); |
| 21 | |
| 22 | - assert(NUMTHREADS); |
| 23 | + assert(NUMTHREADS != 0); |
| 24 | |
| 25 | for (i = 0; i < NUMTHREADS; ++i) { |
| 26 | threadp = (squidaio_thread_t *)squidaio_thread_pool->alloc(); |