Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Homebrew warning (backport from Fortress) #268

Merged
merged 3 commits into from
Sep 30, 2021
Merged

Fix Homebrew warning (backport from Fortress) #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bc1eed
Use std::milliseconds in poll().
caguero Sep 30, 2021
23c0380
Merge branch 'ign-transport8' into poll_ms_8
caguero Sep 30, 2021
64abc53
Inline
caguero Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Discovery.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ inline namespace IGNITION_TRANSPORT_VERSION_NAMESPACE

try
{
zmq::poll(&items[0], sizeof(items) / sizeof(items[0]), _timeout);
zmq::poll(&items[0], sizeof(items) / sizeof(items[0]),
std::chrono::milliseconds(_timeout));
}
catch(...)
{
Expand Down
4 changes: 2 additions & 2 deletions src/NodeShared.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ void NodeShared::RunReceptionTask()
try
{
zmq::poll(&items[0], sizeof(items) / sizeof(items[0]),
NodeSharedPrivate::Timeout);
std::chrono::milliseconds(NodeSharedPrivate::Timeout));
}
catch(...)
{
Expand Down Expand Up @@ -1713,7 +1713,7 @@ void NodeSharedPrivate::AccessControlHandler()
try
{
zmq::poll(&items[0], sizeof(items) / sizeof(items[0]),
NodeSharedPrivate::Timeout);
std::chrono::milliseconds(NodeSharedPrivate::Timeout));
}
catch(...)
{
Expand Down
2 changes: 1 addition & 1 deletion src/NodeSharedPrivate.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ namespace ignition
public: std::atomic<bool> exit = false;

/// \brief Timeout used for receiving messages (ms.).
public: static const int Timeout = 250;
public: inline static const int Timeout = 250;

////////////////////////////////////////////////////////////////
/////// The following is for asynchronous publication of ///////
Expand Down