Skip to content

Update boost to std #589

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 15 commits into from
Jan 30, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Replaced BOOST_STATIC_ASSERT with static_assert.
  • Loading branch information
glynos committed Jan 30, 2016
commit d81c429c997f054034ac3b49ff96f92a125ad7dd
5 changes: 2 additions & 3 deletions boost/network/protocol/http/client/pimpl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include <boost/network/support/is_async.hpp>
#include <boost/network/support/is_sync.hpp>
#include <boost/optional/optional.hpp>
#include <boost/static_assert.hpp>

namespace boost {
namespace network {
Expand Down Expand Up @@ -60,8 +59,8 @@ class basic_client;
template <class Tag, unsigned version_major, unsigned version_minor>
struct basic_client_impl
: impl::client_base<Tag, version_major, version_minor>::type {
BOOST_STATIC_ASSERT(
(mpl::not_<mpl::and_<is_async<Tag>, is_sync<Tag> > >::value));
static_assert(mpl::not_<mpl::and_<is_async<Tag>, is_sync<Tag> > >::value,
"Client can only be synchronous our asynchronous.");

typedef typename impl::client_base<Tag, version_major, version_minor>::type
base_type;
Expand Down
5 changes: 2 additions & 3 deletions boost/network/protocol/http/traits/resolver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <boost/network/support/is_tcp.hpp>
#include <boost/network/support/is_udp.hpp>
#include <boost/network/protocol/http/support/is_http.hpp>
#include <boost/static_assert.hpp>

namespace boost {
namespace network {
Expand All @@ -31,8 +30,8 @@ struct resolver
typename mpl::if_<mpl::and_<is_udp<Tag>, is_http<Tag> >,
boost::asio::ip::udp::resolver,
unsupported_tag<Tag> >::type> {
BOOST_STATIC_ASSERT(
(mpl::not_<mpl::and_<is_udp<Tag>, is_tcp<Tag> > >::value));
static_assert(mpl::not_<mpl::and_<is_udp<Tag>, is_tcp<Tag> > >::value,
"Transport protocol must be TCP or UDP");
};

} // namespace http
Expand Down
3 changes: 1 addition & 2 deletions boost/network/support/is_tcp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include <boost/mpl/not.hpp>
#include <boost/network/tags.hpp>
#include <boost/static_assert.hpp>
#include <boost/utility/enable_if.hpp>

namespace boost {
Expand All @@ -25,4 +24,4 @@ struct is_tcp<Tag,

} // namespace boost

#endif // BOOST_NETWORK_SUPPORT_IS_TCP_HPP_20100622
#endif // BOOST_NETWORK_SUPPORT_IS_TCP_HPP_20100622
1 change: 0 additions & 1 deletion boost/network/support/is_udp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <boost/mpl/not.hpp>
#include <boost/network/support/is_tcp.hpp>
#include <boost/network/tags.hpp>
#include <boost/static_assert.hpp>
#include <boost/utility/enable_if.hpp>

namespace boost {
Expand Down