Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
7bce4ffb
Unverified
Commit
7bce4ffb
authored
Mar 11, 2018
by
Constantin Rack
Committed by
GitHub
Mar 11, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2982 from bluca/formattweetnacl
Problem: formatting issues in CI
parents
4726f726
8d544ef1
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
5 deletions
+10
-5
ip.cpp
src/ip.cpp
+0
-0
options.cpp
src/options.cpp
+0
-0
socket_base.cpp
src/socket_base.cpp
+0
-0
socks_connecter.cpp
src/socks_connecter.cpp
+0
-0
tcp_connecter.cpp
src/tcp_connecter.cpp
+0
-0
tweetnacl.c
src/tweetnacl.c
+9
-4
ypipe.hpp
src/ypipe.hpp
+0
-0
ypipe_conflate.hpp
src/ypipe_conflate.hpp
+0
-0
zmq.cpp
src/zmq.cpp
+1
-1
No files found.
src/ip.cpp
View file @
7bce4ffb
src/options.cpp
View file @
7bce4ffb
src/socket_base.cpp
View file @
7bce4ffb
src/socks_connecter.cpp
View file @
7bce4ffb
src/tcp_connecter.cpp
View file @
7bce4ffb
src/tweetnacl.c
View file @
7bce4ffb
...
...
@@ -32,18 +32,22 @@
*/
#include "platform.hpp"
#if defined
(ZMQ_USE_TWEETNACL)
#if defined(ZMQ_USE_TWEETNACL)
/*
Disable warnings for this source only, rather than for the whole
codebase when building with C99 (gcc >= 4.2) or with Microsoft's compiler
*/
#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) && __STDC_VERSION__ < 201112L
# pragma GCC diagnostic ignored "-Wsign-compare"
#if defined __GNUC__ \
&& (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) \
&& __STDC_VERSION__ < 201112L
#pragma GCC diagnostic ignored "-Wsign-compare"
#elif defined _MSC_VER
#
pragma warning (disable:
4018 4244 4146)
#
pragma warning(disable :
4018 4244 4146)
#endif
// clang-format off
#include "tweetnacl.h"
#define FOR(i,n) for (i = 0;i < n;++i)
...
...
@@ -986,3 +990,4 @@ int sodium_init (void)
#endif
#endif
// clang-format on
src/ypipe.hpp
View file @
7bce4ffb
src/ypipe_conflate.hpp
View file @
7bce4ffb
src/zmq.cpp
View file @
7bce4ffb
...
...
@@ -685,7 +685,7 @@ const char *zmq_msg_gets (const zmq_msg_t *msg_, const char *property_)
}
}
// Polling.
// Polling.
#if defined ZMQ_HAVE_POLLER
inline
int
zmq_poller_poll
(
zmq_pollitem_t
*
items_
,
int
nitems_
,
long
timeout_
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment