Skip to content

Use EXPECT_FALSE instead of EXPECT_EQ(false, X) #752

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.

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

Merged
merged 21 commits into from
Apr 6, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
squash: use boost array/chrono for 1.55
  • Loading branch information
deanberris committed Apr 6, 2017
commit 5219b9483338582bacbfb8cf960a1ac923277d49
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ struct http_async_connection
callback, generator, ec, endpoint_range);
}));
if (timeout_ > 0) {
timer_.expires_from_now(std::chrono::seconds(timeout_));
timer_.expires_from_now(boost::chrono::seconds(timeout_));
timer_.async_wait(request_strand_.wrap([=] (boost::system::error_code const &ec) {
self->handle_timeout(ec);
}));
Expand Down
2 changes: 1 addition & 1 deletion boost/network/protocol/http/server/async_connection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ struct async_connection
}

private:
typedef std::array<char, BOOST_NETWORK_HTTP_SERVER_CONNECTION_BUFFER_SIZE>
typedef boost::array<char, BOOST_NETWORK_HTTP_SERVER_CONNECTION_BUFFER_SIZE>
buffer_type;

public:
Expand Down