Skip to content
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.

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

Modernize cmake scripts and support MSVC 2017 #834

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

Conversation

anonimal
Copy link

@anonimal anonimal commented Apr 2, 2018

btolfa and others added 6 commits March 31, 2018 13:55
Visual Studio 2017 cannot decide if it is

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

or

  boost::spirit::true_type

cpp-netlib@a5252b9
4a202d3 Work around ambiguous true_type (Tengiz Sharafiev)
cbb10e6 Build: fix build with Boost 1.66.0 (Tengiz Sharafiev)
2cb82ec Build: Clean up and modernize cmake scripts (Tengiz Sharafiev)
This option allows us to setup _WIN32_WINNT definition value
from cmake command line
Default value is 0x0501 (_WIN32_WINNT_WINXP)
https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
48bbadb Build: Add cmake option CPP-NETLIB_WINAPI_VERSION (Tengiz Sharafiev)
Copy link
Member

@deanberris deanberris left a comment

Choose a reason for hiding this comment

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

I love the idea of modernising the CMake config -- I think we should be more proactive in doing this going forward. However, I do have concerns about the scope of these changes.

Can you please break it up into smaller parts, separating the code changes from the CMake config changes?

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::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?

@@ -19,6 +19,7 @@
#include <boost/asio/detail/throw_error.hpp>
#include <boost/asio/error.hpp>
#include <boost/asio/stream_socket_service.hpp>
#include <boost/asio/io_service.hpp>
Copy link
Member

Choose a reason for hiding this comment

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

Is this strictly necessary? If so, can you make this a self-contained PR?

@deanberris
Copy link
Member

Also, just to be clear, most of this already looks good to me -- I'm just a little concerned about the granularity of the changes. One of the failures in the travis CI suggests that there's one functional regression (in the tests for streaming get). It could be a transient error, so I'm re-running those to make sure it's not because of the changes in this PR.

@anonimal
Copy link
Author

anonimal commented Apr 3, 2018

ping @btolfa

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants