Skip to content

Commit 9ab3c24

Browse files
committed
Fix warnings and errors
1 parent d3a1eaa commit 9ab3c24

31 files changed

+86
-67
lines changed

include/boost/http_proto.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
#include <boost/http_proto/codec/deflate_service.hpp>
5353
#include <boost/http_proto/codec/encoder.hpp>
5454

55-
#include <boost/http_proto/mime/mime.hpp>
55+
#include <boost/http_proto/mime/mime_types.hpp>
5656

5757
#endif

include/boost/http_proto/basic_header.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ namespace http_proto {
2323
@ref request, @ref request_view,
2424
@ref response, @ref response_view
2525
*/
26-
class basic_header
26+
class BOOST_SYMBOL_VISIBLE
27+
basic_header
2728
{
2829
public:
2930
/** Destructor

include/boost/http_proto/bnf/range.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ class range
4242

4343
class iterator;
4444

45-
constexpr range(
46-
range const&) = default;
47-
constexpr range& operator=(
48-
range const&) = default;
45+
range(range const&) = default;
46+
range& operator=(range const&) = default;
4947

5048
/** Default constructor
5149

include/boost/http_proto/bnf/type_traits.hpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,13 @@ struct is_element<T, boost::void_t<
5757
std::declval<char const*>(),
5858
std::declval<char const*>(),
5959
std::declval<error_code&>())
60-
)>> : std::integral_constant<bool,
60+
)>> : std::true_type
61+
#if 0
62+
std::integral_constant<bool,
6163
std::is_default_constructible<T>::value &&
6264
std::is_copy_constructible<T>::value &&
6365
std::is_copy_assignable<T>::value>
66+
#endif
6467
{
6568
};
6669

@@ -101,10 +104,13 @@ struct is_list<T, boost::void_t<decltype(
101104
std::declval<char const*>(),
102105
std::declval<char const*>(),
103106
std::declval<error_code&>())
104-
)>> : std::integral_constant<bool,
107+
)>> : std::true_type
108+
#if 0
109+
std::integral_constant<bool,
105110
std::is_default_constructible<T>::value &&
106111
std::is_copy_constructible<T>::value &&
107112
std::is_copy_assignable<T>::value>
113+
#endif
108114
{
109115
};
110116

include/boost/http_proto/codec/decoder.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
namespace boost {
2020
namespace http_proto {
2121

22-
class decoder
22+
class BOOST_SYMBOL_VISIBLE
23+
decoder
2324
{
2425
public:
2526
struct buffers
@@ -41,7 +42,8 @@ class decoder
4142

4243
//------------------------------------------------
4344

44-
class decoder_type
45+
class BOOST_SYMBOL_VISIBLE
46+
decoder_type
4547
{
4648
public:
4749
virtual

include/boost/http_proto/codec/encoder.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
namespace boost {
2020
namespace http_proto {
2121

22-
class encoder
22+
class BOOST_SYMBOL_VISIBLE
23+
encoder
2324
{
2425
public:
2526
struct buffers
@@ -41,7 +42,8 @@ class encoder
4142

4243
//------------------------------------------------
4344

44-
class encoder_type
45+
class BOOST_SYMBOL_VISIBLE
46+
encoder_type
4547
{
4648
public:
4749
virtual

include/boost/http_proto/context.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ namespace http_proto {
2020

2121
#ifndef BOOST_HTTP_PROTO_DOCS
2222
class codecs;
23-
class mime;
23+
class mime_types;
2424
#endif
2525

2626
class context
2727
{
2828
struct data;
2929

30-
codecs* codecs_;
31-
mime* mime_;
30+
http_proto::codecs* codecs_;
31+
http_proto::mime_types* mime_types_;
3232

3333
public:
3434
struct service
@@ -53,10 +53,10 @@ class context
5353
return *codecs_;
5454
}
5555

56-
http_proto::mime&
57-
mime() noexcept
56+
http_proto::mime_types&
57+
mime_types() noexcept
5858
{
59-
return *mime_;
59+
return *mime_types_;
6060
}
6161

6262
//--------------------------------------------

include/boost/http_proto/headers.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ enum class field : unsigned short;
2626
class headers_view;
2727
#endif
2828

29-
class headers : public basic_header
29+
class BOOST_SYMBOL_VISIBLE
30+
headers : public basic_header
3031
{
3132
// headers have a maximum size of 2^32-1 chars
3233
using off_t = std::uint32_t;
@@ -45,13 +46,11 @@ class headers : public basic_header
4546
static constexpr std::size_t
4647
max_header_size_ = ((off_t)(-1));
4748

48-
constexpr
4949
static
5050
std::size_t
5151
align_up(
5252
std::size_t n) noexcept;
5353

54-
constexpr
5554
static
5655
std::size_t
5756
bytes_needed(

include/boost/http_proto/headers_view.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ enum class field : unsigned short;
2626

2727
/** A read-only, random access container of HTTP fields
2828
*/
29-
class headers_view : public basic_header
29+
class BOOST_SYMBOL_VISIBLE
30+
headers_view
31+
: public basic_header
3032
{
3133
// headers have a maximum size of 2^32-1 chars
3234
using off_t = std::uint32_t;

include/boost/http_proto/impl/context.hpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ make_service(
5151
Args>(args)...))));
5252
}
5353

54-
template<class T, class... Args>
54+
template<class T>
5555
T*
56-
find_service(
57-
context& ctx,
58-
Args&&... args)
56+
find_service(context& ctx) noexcept
5957
{
6058
auto const ti = std::type_index(
6159
typeid(detail::get_key_type<T>));
@@ -68,8 +66,7 @@ find_service(
6866

6967
template<class T>
7068
T&
71-
get_service(
72-
context& ctx)
69+
get_service(context& ctx)
7370
{
7471
auto ps = find_service<T>();
7572
if(! ps)

0 commit comments

Comments
 (0)