Skip to content

Modernize cmake scripts and support MSVC 2017 #834

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: 0.13-release
Choose a base branch
from
Open

Modernize cmake scripts and support MSVC 2017 #834

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cb82ec
Build: Clean up and modernize cmake scripts
btolfa Mar 24, 2018
cbb10e6
Build: fix build with Boost 1.66.0
btolfa Mar 24, 2018
4a202d3
Work around ambiguous true_type
btolfa Mar 14, 2018
604d50e
Merge pull request #1
anonimal Apr 2, 2018
48bbadb
Build: Add cmake option CPP-NETLIB_WINAPI_VERSION
btolfa Apr 1, 2018
3c777df
Merge pull request #2
anonimal Apr 3, 2018
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
Work around ambiguous true_type 
Visual Studio 2017 cannot decide if it is

  boost::integral_constant<bool,true> boost::true_type

or

  boost::spirit::true_type

a5252b9
  • Loading branch information
@btolfa
btolfa committed Mar 31, 2018
commit 4a202d370873044084354b976c576d0430d88ef4
19 changes: 9 additions & 10 deletions boost/network/protocol/http/server/impl/parsers.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,21 @@ namespace http {
BOOST_NETWORK_INLINE void parse_version(
std::string const& partial_parsed,
std::tuple<std::uint8_t, std::uint8_t>& version_pair) {
using namespace boost::spirit::qi;
parse(partial_parsed.begin(), partial_parsed.end(),
(lit("HTTP/") >> ushort_ >> '.' >> ushort_), version_pair);
boost::spirit::qi::parse(partial_parsed.begin(), partial_parsed.end(),
(boost::spirit::qi::lit("HTTP/") >> boost::spirit::qi::ushort_ >> '.' >> boost::spirit::qi::ushort_), version_pair);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please re-base, as I've just merged a change that addresses this particular issue.

}

BOOST_NETWORK_INLINE void parse_headers(
std::string const& input, std::vector<request_header_narrow>& container) {
u8_to_u32_iterator<std::string::const_iterator> begin = input.begin(),
end = input.end();
using namespace boost::spirit::qi;
typedef as<boost::spirit::traits::u32_string> as_u32_string;
parse(begin, end,
*(+((alnum | punct) - ':') >> lit(": ") >>
as_u32_string()[+((unicode::alnum | space | punct) - '\r' - '\n')] >>
lit("\r\n")) >>
lit("\r\n"),

using as_u32_string = boost::spirit::qi::as<boost::spirit::traits::u32_string>;
boost::spirit::qi::parse(begin, end,
*(+((boost::spirit::qi::alnum | boost::spirit::qi::punct) - ':') >> boost::spirit::qi::lit(": ") >>
as_u32_string()[+((boost::spirit::qi::unicode::alnum | boost::spirit::qi::space | boost::spirit::qi::punct) - '\r' - '\n')] >>
boost::spirit::qi::lit("\r\n")) >>
boost::spirit::qi::lit("\r\n"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you separate out this change, (or rebase) to its own pull request?

container);
}

Expand Down