3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-19 18:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3513 from bluca/clang7

Browse Source 
Problem: clang-format 5 has issues with comments
This commit is contained in:
Doron Somech 2019-05-18 19:18:42 +03:00 committed by GitHub
commit 046ccfc408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -99,14 +99,15 @@ matrix:
- env: BUILD_TYPE=android CURVE=tweetnacl - env: BUILD_TYPE=android CURVE=tweetnacl
os: linux os: linux
dist: trusty dist: trusty
- env: BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format - env: BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/lib/llvm-7/bin/clang-format
os: linux os: linux
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-trusty-5.0 - llvm-toolchain-trusty-7
- ubuntu-toolchain-r-test
packages: packages:
- clang-5.0 - clang-format-7
- env: BUILD_TYPE=default POLLER=poll - env: BUILD_TYPE=default POLLER=poll
os: linux os: linux
- env: BUILD_TYPE=default POLLER=select - env: BUILD_TYPE=default POLLER=select

2
src/zmq.cpp
View File

@ -700,7 +700,7 @@ const char *zmq_msg_gets (const zmq_msg_t *msg_, const char *property_)
return NULL; return NULL;
} }
// Polling. // Polling.
#if defined ZMQ_HAVE_POLLER #if defined ZMQ_HAVE_POLLER
inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_) inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)