Replaced BOOST_STATIC_ASSERT with static_assert.

glynos · glynos · commit d81c429c997f · 2016-01-30T10:59:37.000+01:00
diff --git a/boost/network/protocol/http/client/pimpl.hpp b/boost/network/protocol/http/client/pimpl.hpp
@@ -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 {
@@ -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;
diff --git a/boost/network/protocol/http/traits/resolver.hpp b/boost/network/protocol/http/traits/resolver.hpp
@@ -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 {
@@ -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
diff --git a/boost/network/support/is_tcp.hpp b/boost/network/support/is_tcp.hpp
@@ -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 {
@@ -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
diff --git a/boost/network/support/is_udp.hpp b/boost/network/support/is_udp.hpp
@@ -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 {
