walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1814 from nghttp2/workflow-bump-compilers 

Workflow bump compilers
This commit is contained in:
Tatsuhiro Tsujikawa 2022-10-04 21:47:39 +09:00 committed by GitHub
parent 93f1096de3 8a355db8d9
commit 8e120de5bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/build.yml vendored
View File

@ -36,8 +36,8 @@ jobs:
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
sudo apt-get install \ sudo apt-get install \
g++-11 \ g++-12 \
clang-12 \ clang-14 \
autoconf \ autoconf \
automake \ automake \
autotools-dev \ autotools-dev \
@ -74,8 +74,8 @@ jobs:
- name: Setup clang (Linux) - name: Setup clang (Linux)
if: runner.os == 'Linux' && matrix.compiler == 'clang' if: runner.os == 'Linux' && matrix.compiler == 'clang'
run: | run: |
echo 'CC=clang-12' >> $GITHUB_ENV echo 'CC=clang-14' >> $GITHUB_ENV
echo 'CXX=clang++-12' >> $GITHUB_ENV echo 'CXX=clang++-14' >> $GITHUB_ENV
- name: Setup clang (MacOS) - name: Setup clang (MacOS)
if: runner.os == 'macOS' && matrix.compiler == 'clang' if: runner.os == 'macOS' && matrix.compiler == 'clang'
run: | run: |
@ -84,8 +84,8 @@ jobs:
- name: Setup gcc (Linux) - name: Setup gcc (Linux)
if: runner.os == 'Linux' && matrix.compiler == 'gcc' if: runner.os == 'Linux' && matrix.compiler == 'gcc'
run: | run: |
echo 'CC=gcc-11' >> $GITHUB_ENV echo 'CC=gcc-12' >> $GITHUB_ENV
echo 'CXX=g++-11' >> $GITHUB_ENV echo 'CXX=g++-12' >> $GITHUB_ENV
- name: Setup gcc (MacOS) - name: Setup gcc (MacOS)
if: runner.os == 'macOS' && matrix.compiler == 'gcc' if: runner.os == 'macOS' && matrix.compiler == 'gcc'
run: | run: |

8
src/memchunk_test.cc
View File

@ -151,9 +151,9 @@ void test_memchunks_riovec(void) {
MemchunkPool16 pool; MemchunkPool16 pool;
Memchunks16 chunks(&pool); Memchunks16 chunks(&pool);
char buf[3 * 16]; std::array<char, 3 * 16> buf{};
chunks.append(buf, sizeof(buf)); chunks.append(buf.data(), buf.size());
std::array<struct iovec, 2> iov; std::array<struct iovec, 2> iov;
auto iovcnt = chunks.riovec(iov.data(), iov.size()); auto iovcnt = chunks.riovec(iov.data(), iov.size());
@ -184,8 +184,8 @@ void test_memchunks_recycle(void) {
MemchunkPool16 pool; MemchunkPool16 pool;
{ {
Memchunks16 chunks(&pool); Memchunks16 chunks(&pool);
char buf[32]; std::array<char, 32> buf{};
chunks.append(buf, sizeof(buf)); chunks.append(buf.data(), buf.size());
} }
CU_ASSERT(32 == pool.poolsize); CU_ASSERT(32 == pool.poolsize);
CU_ASSERT(nullptr != pool.freelist); CU_ASSERT(nullptr != pool.freelist);