Skip to content

Commit 31b5937

Browse files
committed
Refactored URI interface. The implementation parser won't do anything now, this will be the next step.
1 parent a938205 commit 31b5937

File tree

11 files changed

+462
-480
lines changed

11 files changed

+462
-480
lines changed

boost/network/uri.hpp

+9-10
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@
66
// (See accompanying file LICENSE_1_0.txt or copy at
77
// http://www.boost.org/LICENSE_1_0.txt)
88

9-
#include <boost/network/protocol/http/tags.hpp>
109
#include <boost/network/traits/string.hpp>
11-
#include <boost/network/uri/basic_uri.hpp>
12-
#include <boost/network/uri/http/uri.hpp>
10+
#include <boost/network/uri/uri.hpp>
1311

14-
namespace boost { namespace network { namespace uri {
15-
16-
typedef basic_uri<boost::network::tags::default_string> uri;
17-
typedef basic_uri<boost::network::tags::default_wstring> wuri;
1812

19-
namespace http {
20-
typedef basic_uri<boost::network::http::tags::http_default_8bit_tcp_resolve> uri;
21-
}
13+
namespace boost { namespace network { namespace uri {
2214

15+
typedef basic_uri<boost::network::tags::default_string> uri;
16+
typedef basic_uri<boost::network::tags::default_wstring> wuri;
17+
//
18+
// namespace http {
19+
// typedef basic_uri<boost::network::http::tags::http_default_8bit_tcp_resolve> uri;
20+
// }
21+
//
2322
} // namespace uri
2423
} // namespace network
2524
} // namespace boost

boost/network/uri/basic_uri.hpp

-242
This file was deleted.

boost/network/uri/basic_uri_fwd.hpp

-19
This file was deleted.

boost/network/uri/detail/impl/parse_uri.ipp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
// Copyright 2010-2011 Dean Michael Berris.
2+
// Copyright 2010-2011 Dean Michael Berris.
33
// Copyright 2009 Jeroen Habraken.
44
// Distributed under the Boost Software License, Version 1.0.
55
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -220,7 +220,7 @@ struct choose_uri_base<std::wstring, Dummy>
220220
{
221221
typedef uri_parts_wide_base type;
222222
};
223-
223+
224224
namespace qi = boost::spirit::qi;
225225

226226
template <typename Iterator, typename String>
@@ -398,11 +398,11 @@ BOOST_NETWORK_INLINE bool parse_uri_impl(boost::iterator_range<std::wstring::con
398398
}
399399

400400
} /* detail */
401-
401+
402402
} /* uri */
403-
403+
404404
} /* network */
405-
405+
406406
} /* boost */
407407

408408
#endif /* PARSE_URI_IMPL_AQAWWXWT */

boost/network/uri/http/detail/parse_specific.hpp

-49
This file was deleted.

0 commit comments

Comments
 (0)