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.

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

Merged
merged 21 commits into from
Apr 6, 2017
Merged

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

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
ea14831
Use EXPECT_FALSE instead of EXPECT_EQ(false, X)
deanberris Apr 6, 2017
a3c79e0
squash: fix response tests too
deanberris Apr 6, 2017
2300c60
squash: let make determine the number of jobs
deanberris Apr 6, 2017
0f42783
squash: use ccache for the build
deanberris Apr 6, 2017
9a1121d
squash: set the compiler version properly
deanberris Apr 6, 2017
ea626d6
squash: use clang-3.8 as test compiler
deanberris Apr 6, 2017
8ef8677
squash: exclude asan and tsan builds from g++ matrix
deanberris Apr 6, 2017
47d91b2
squash: do not use ${HOME}
deanberris Apr 6, 2017
dab4bd4
squash: remove cache until we can make it work
deanberris Apr 6, 2017
2dd328e
squash: try installing ccache from testing too
deanberris Apr 6, 2017
4289ca9
squash: fix link to c compiler
deanberris Apr 6, 2017
009e2d5
squash: still not use ccache
deanberris Apr 6, 2017
fcf669d
squash: remove ccache installation for now
deanberris Apr 6, 2017
5219b94
squash: use boost array/chrono for 1.55
deanberris Apr 6, 2017
d42f0b3
squash: try ccache again
deanberris Apr 6, 2017
a344712
squash: add proper boost.asio defines for supporting clang
deanberris Apr 6, 2017
9050af6
squash: fix travis config
deanberris Apr 6, 2017
1243a50
squash: script better
deanberris Apr 6, 2017
b6cd5c4
squash: add more boost.asio config options
deanberris Apr 6, 2017
5a39a86
squash: use boost thread v3
deanberris Apr 6, 2017
17cef53
squash: use libstdc++ explicitly on Linux when using clang
deanberris Apr 6, 2017
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: add proper boost.asio defines for supporting clang
  • Loading branch information
@deanberris
deanberris committed Apr 6, 2017
commit a34471238e5c348c4f109566ffd2a641fb775e1f
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
# We want to link in C++11 mode in Clang too, but also set a high enough
# template depth for the template metaprogramming.
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11")
set (CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -Wall -ftemplate-depth=256 -std=c++11 -DBOOST_ASIO_HAS_STD_CHRONO -DBOOST_ASIO_HAS_STD_ARRAY")
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Use libc++ only in OS X.
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
Expand Down
6 changes: 3 additions & 3 deletions boost/network/protocol/http/client/connection/async_normal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ struct http_async_connection
connection_delegate_ptr;

http_async_connection(resolver_type& resolver, resolve_function resolve,
bool follow_redirect, int timeout,
bool follow_redirect, int64_t timeout,
bool remove_chunk_markers,
connection_delegate_ptr delegate)
: timeout_(timeout),
Expand Down Expand Up @@ -187,7 +187,7 @@ struct http_async_connection
callback, generator, ec, endpoint_range);
}));
if (timeout_ > 0) {
timer_.expires_from_now(boost::chrono::seconds(timeout_));
timer_.expires_from_now(std::chrono::seconds(timeout_));
timer_.async_wait(request_strand_.wrap([=] (boost::system::error_code const &ec) {
self->handle_timeout(ec);
}));
Expand Down Expand Up @@ -578,7 +578,7 @@ struct http_async_connection
}
}

int timeout_;
int64_t timeout_;
bool remove_chunk_markers_;
boost::asio::steady_timer timer_;
bool is_timedout_;
Expand Down
2 changes: 1 addition & 1 deletion boost/network/protocol/http/server/async_connection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ struct async_connection
}

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

public:
Expand Down