Skip to content

Commit 854ce40

Browse files
glynosglynos
committed
Ran boost's inspect program and fixed files that were reported.
1 parent d0e4beb commit 854ce40

24 files changed

+222
-216
lines changed

‎CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Copyright (c) Dean Michael Berris 2010.
2+
# Distributed under the Boost Software License, Version 1.0.
3+
# (See accompanying file LICENSE_1_0.txt or copy at
4+
# http://www.boost.org/LICENSE_1_0.txt)
5+
16
cmake_minimum_required(VERSION 2.6)
27
project(CPP-NETLIB)
38
find_package( Boost 1.41.0 )

‎boost/network/message.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace boost { namespace network {
4545
typedef Tag tag;
4646

4747
typedef typename headers_container<tag>::type headers_container_type;
48-
typedef typename string<tag>::type string_type;
48+
typedef typename string<tag>::type string_type;
4949

5050
basic_message()
5151
: _headers(), _body(), _source(), _destination()
@@ -89,8 +89,8 @@ namespace boost { namespace network {
8989
friend struct detail::wrapper_base<tag> ;
9090

9191
headers_container_type _headers;
92-
string_type _body;
93-
string_type _source;
92+
string_type _body;
93+
string_type _source;
9494
string_type _destination;
9595
};
9696

‎boost/network/message/transformers.hpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ namespace boost { namespace network {
2121
namespace impl {
2222
template <class Algorithm, class Selector>
2323
struct get_real_algorithm {
24-
typedef typename boost::function_traits<
25-
typename boost::remove_pointer<
26-
Algorithm
27-
>::type
28-
>
29-
::result_type::
30-
template type<
31-
typename boost::function_traits<
32-
typename boost::remove_pointer<
33-
Selector
34-
>::type
35-
>::result_type
36-
> type;
24+
typedef typename boost::function_traits<
25+
typename boost::remove_pointer<
26+
Algorithm
27+
>::type
28+
>
29+
::result_type::
30+
template type<
31+
typename boost::function_traits<
32+
typename boost::remove_pointer<
33+
Selector
34+
>::type
35+
>::result_type
36+
> type;
3737
};
3838

3939
template <class Algorithm, class Selector>

‎boost/network/message/transformers/selectors.hpp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,35 @@ namespace boost { namespace network {
1313
struct destination_selector;
1414
} // namespace selectors
1515

16-
selectors::source_selector source_(selectors::source_selector);
17-
selectors::destination_selector destination_(selectors::destination_selector);
18-
19-
namespace selectors {
20-
struct source_selector {
21-
private:
22-
source_selector() {};
23-
source_selector(source_selector const &) {};
24-
friend source_selector boost::network::source_(source_selector);
25-
};
26-
27-
struct destination_selector {
28-
private:
29-
destination_selector() {};
30-
destination_selector(destination_selector const &) {};
31-
friend destination_selector boost::network::destination_(destination_selector);
32-
};
33-
} // namespace selectors
34-
35-
typedef selectors::source_selector (*source_selector_t)(selectors::source_selector);
36-
typedef selectors::destination_selector (*destination_selector_t)(selectors::destination_selector);
37-
38-
inline selectors::source_selector source_(selectors::source_selector) {
39-
return selectors::source_selector();
40-
}
41-
42-
inline selectors::destination_selector destination_(selectors::destination_selector) {
43-
return selectors::destination_selector();
44-
}
16+
selectors::source_selector source_(selectors::source_selector);
17+
selectors::destination_selector destination_(selectors::destination_selector);
18+
19+
namespace selectors {
20+
struct source_selector {
21+
private:
22+
source_selector() {};
23+
source_selector(source_selector const &) {};
24+
friend source_selector boost::network::source_(source_selector);
25+
};
26+
27+
struct destination_selector {
28+
private:
29+
destination_selector() {};
30+
destination_selector(destination_selector const &) {};
31+
friend destination_selector boost::network::destination_(destination_selector);
32+
};
33+
} // namespace selectors
34+
35+
typedef selectors::source_selector (*source_selector_t)(selectors::source_selector);
36+
typedef selectors::destination_selector (*destination_selector_t)(selectors::destination_selector);
37+
38+
inline selectors::source_selector source_(selectors::source_selector) {
39+
return selectors::source_selector();
40+
}
41+
42+
inline selectors::destination_selector destination_(selectors::destination_selector) {
43+
return selectors::destination_selector();
44+
}
4545

4646
} // namespace network
4747

‎boost/network/message/transformers/to_lower.hpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,30 @@ namespace boost { namespace network {
4949

5050
} // namespace impl
5151

52-
namespace detail {
53-
struct to_lower_placeholder_helper;
54-
}
52+
namespace detail {
53+
struct to_lower_placeholder_helper;
54+
}
5555

56-
detail::to_lower_placeholder_helper to_lower_(detail::to_lower_placeholder_helper);
56+
detail::to_lower_placeholder_helper to_lower_(detail::to_lower_placeholder_helper);
5757

58-
namespace detail {
58+
namespace detail {
5959

60-
struct to_lower_placeholder_helper {
61-
template <class Selector>
62-
struct type : public impl::to_lower_transformer<Selector> { };
63-
private:
64-
to_lower_placeholder_helper() {}
65-
to_lower_placeholder_helper(to_lower_placeholder_helper const &) {}
66-
friend to_lower_placeholder_helper boost::network::to_lower_(to_lower_placeholder_helper);
67-
};
60+
struct to_lower_placeholder_helper {
61+
template <class Selector>
62+
struct type : public impl::to_lower_transformer<Selector> { };
63+
private:
64+
to_lower_placeholder_helper() {}
65+
to_lower_placeholder_helper(to_lower_placeholder_helper const &) {}
66+
friend to_lower_placeholder_helper boost::network::to_lower_(to_lower_placeholder_helper);
67+
};
6868

69-
}
69+
}
7070

71-
typedef detail::to_lower_placeholder_helper (*to_lower_placeholder)(detail::to_lower_placeholder_helper);
71+
typedef detail::to_lower_placeholder_helper (*to_lower_placeholder)(detail::to_lower_placeholder_helper);
7272

73-
inline detail::to_lower_placeholder_helper to_lower_(detail::to_lower_placeholder_helper) {
74-
return detail::to_lower_placeholder_helper();
75-
}
73+
inline detail::to_lower_placeholder_helper to_lower_(detail::to_lower_placeholder_helper) {
74+
return detail::to_lower_placeholder_helper();
75+
}
7676

7777
} // namespace network
7878

‎boost/network/message/transformers/to_upper.hpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,30 +49,30 @@ namespace boost { namespace network {
4949

5050
} // namespace impl
5151

52-
namespace detail {
53-
struct to_upper_placeholder_helper;
54-
}
52+
namespace detail {
53+
struct to_upper_placeholder_helper;
54+
}
5555

56-
detail::to_upper_placeholder_helper to_upper_(detail::to_upper_placeholder_helper);
56+
detail::to_upper_placeholder_helper to_upper_(detail::to_upper_placeholder_helper);
5757

58-
namespace detail {
58+
namespace detail {
5959

60-
struct to_upper_placeholder_helper {
61-
template <class Selector>
62-
struct type : public impl::to_upper_transformer<Selector> { };
63-
private:
64-
to_upper_placeholder_helper() {}
65-
to_upper_placeholder_helper(to_upper_placeholder_helper const &) {}
66-
friend to_upper_placeholder_helper boost::network::to_upper_(to_upper_placeholder_helper);
67-
};
60+
struct to_upper_placeholder_helper {
61+
template <class Selector>
62+
struct type : public impl::to_upper_transformer<Selector> { };
63+
private:
64+
to_upper_placeholder_helper() {}
65+
to_upper_placeholder_helper(to_upper_placeholder_helper const &) {}
66+
friend to_upper_placeholder_helper boost::network::to_upper_(to_upper_placeholder_helper);
67+
};
6868

69-
}
69+
}
7070

71-
typedef detail::to_upper_placeholder_helper (*to_upper_placeholder)(detail::to_upper_placeholder_helper);
71+
typedef detail::to_upper_placeholder_helper (*to_upper_placeholder)(detail::to_upper_placeholder_helper);
7272

73-
inline detail::to_upper_placeholder_helper to_upper_(detail::to_upper_placeholder_helper) {
74-
return detail::to_upper_placeholder_helper();
75-
}
73+
inline detail::to_upper_placeholder_helper to_upper_(detail::to_upper_placeholder_helper) {
74+
return detail::to_upper_placeholder_helper();
75+
}
7676

7777
} // namespace network
7878

‎boost/network/message/wrappers/headers.hpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
namespace boost { namespace network {
1616

17-
/// Template metaprogram to get the range type for a message
17+
/// Template metaprogram to get the range type for a message
1818
template <class Message>
1919
struct headers_range {
20-
typedef typename headers_container<typename Message::tag>::type headers_container_type;
20+
typedef typename headers_container<typename Message::tag>::type headers_container_type;
2121
typedef typename
2222
boost::iterator_range<typename headers_container_type::const_iterator>
2323
type;
@@ -29,11 +29,11 @@ namespace boost { namespace network {
2929
* using operator[] taking a string as the index and returns
3030
* a range of iterators (std::pair<iterator, iterator>)
3131
* whose keys are all equal to the index string.
32-
*
33-
* This type is also convertible to a
34-
* headers_range<basic_message<tag> >::type
35-
* Which allows for full range support.
36-
*
32+
*
33+
* This type is also convertible to a
34+
* headers_range<basic_message<tag> >::type
35+
* Which allows for full range support.
36+
*
3737
*/
3838
namespace impl {
3939
template <class Tag>
@@ -43,8 +43,8 @@ namespace boost { namespace network {
4343
typedef typename string<Tag>::type string_type;
4444
typedef typename headers_range<message_type>::type range_type;
4545
typedef typename headers_container<Tag>::type headers_container_type;
46-
typedef typename headers_container_type::const_iterator const_iterator;
47-
typedef typename headers_container_type::iterator iterator;
46+
typedef typename headers_container_type::const_iterator const_iterator;
47+
typedef typename headers_container_type::iterator iterator;
4848

4949
explicit headers_wrapper(basic_message<tag> & message_)
5050
: detail::wrapper_base<tag>(message_)
@@ -66,9 +66,9 @@ namespace boost { namespace network {
6666
return headers_wrapper<Tag>::_message.headers().end();
6767
};
6868

69-
operator range_type () {
70-
return make_iterator_range(headers_wrapper<Tag>::_message.headers().begin(), headers_wrapper<Tag>::_message.headers().end());
71-
};
69+
operator range_type () {
70+
return make_iterator_range(headers_wrapper<Tag>::_message.headers().begin(), headers_wrapper<Tag>::_message.headers().end());
71+
};
7272

7373
};
7474
} // namespace impl

‎boost/network/protocol/http/connection.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ namespace boost { namespace network { namespace http {
220220
size_t difference = bytes_to_read - bytes_transferred;
221221
array<char,BOOST_HTTP_SERVER_BUFFER_SIZE>::iterator start = buffer_.begin(),
222222
past_end = start;
223-
std::advance(past_end, std::min(bytes_to_read,bytes_transferred));
223+
std::advance(past_end, (std::min)(bytes_to_read,bytes_transferred));
224224
request_.body.append(buffer_.begin(), past_end);
225225
if (difference == 0) {
226226
handler_(request_, response_);

‎boost/network/protocol/http/impl/client.ipp

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎boost/network/protocol/http/impl/message.ipp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ namespace boost { namespace network { namespace http {
8686
};
8787

8888
return result;
89-
}
89+
}
9090

9191
template <typename Tag>
9292
typename message_impl<Tag>::string_type const message_impl<Tag>::make_query_string(typename query_container<Tag>::type const & query_params)
@@ -168,12 +168,12 @@ namespace boost { namespace network { namespace http {
168168
char base64code3;
169169

170170
base64code0 = decoding_data[static_cast<int>(input_ptr[i])];
171-
if(base64code0==nop) // non base64 character
171+
if(base64code0==nop) // non base64 character
172172
return false;
173173
if(!(++i<input_length)) // we need at least two input bytes for first byte output
174174
return false;
175175
base64code1 = decoding_data[static_cast<int>(input_ptr[i])];
176-
if(base64code1==nop) // non base64 character
176+
if(base64code1==nop) // non base64 character
177177
return false;
178178

179179
output += ((base64code0 << 2) | ((base64code1 >> 4) & 0x3));
@@ -185,7 +185,7 @@ namespace boost { namespace network { namespace http {
185185
return true;
186186
}
187187
base64code2 = decoding_data[static_cast<int>(input_ptr[i])];
188-
if(base64code2==nop) // non base64 character
188+
if(base64code2==nop) // non base64 character
189189
return false;
190190

191191
output += ((base64code1 << 4) & 0xf0) | ((base64code2 >> 2) & 0x0f);
@@ -198,7 +198,7 @@ namespace boost { namespace network { namespace http {
198198
return true;
199199
}
200200
base64code3 = decoding_data[static_cast<int>(input_ptr[i])];
201-
if(base64code3==nop) // non base64 character
201+
if(base64code3==nop) // non base64 character
202202
return false;
203203

204204
output += (((base64code2 << 6) & 0xc0) | base64code3 );
@@ -231,9 +231,9 @@ namespace boost { namespace network { namespace http {
231231
int base64code2=0;
232232
int base64code3=0;
233233

234-
base64code0 = (input_ptr[i] >> 2) & 0x3f; // 1-byte 6 bits
234+
base64code0 = (input_ptr[i] >> 2) & 0x3f; // 1-byte 6 bits
235235
output += encoding_data[base64code0];
236-
base64code1 = (input_ptr[i] << 4 ) & 0x3f; // 1-byte 2 bits +
236+
base64code1 = (input_ptr[i] << 4 ) & 0x3f; // 1-byte 2 bits +
237237

238238
if (++i < input_length) {
239239
base64code1 |= (input_ptr[i] >> 4) & 0x0f; // 2-byte 4 bits
@@ -242,7 +242,7 @@ namespace boost { namespace network { namespace http {
242242

243243
if (++i < input_length) {
244244
base64code2 |= (input_ptr[i] >> 6) & 0x03; // 3-byte 2 bits
245-
base64code3 = input_ptr[i] & 0x3f; // 3-byte 6 bits
245+
base64code3 = input_ptr[i] & 0x3f; // 3-byte 6 bits
246246
output += encoding_data[base64code2];
247247
output += encoding_data[base64code3];
248248
} else {

0 commit comments

Comments
 (0)