Latest changes to the URI

[glynos]

I've periodically made some updates to the URI code over the last months (including the fixing errors related to the Boost.Optional situation). I'd appreciate it if you'd check and merge these changes, @deanberris.

[johnco3]

Hi Glyn, I use uri in a visual studio environment, unfortunately the latest
update breaks it - so far, as far as I can tell the change:

"Given up hope of compiling MSVC 2013, so I'm removing the macros." seems
to be the culprit. Specifically you removed this

#if defined(BOOST_NO_CXX11_NOEXCEPT)
#define NETWORK_URI_NOEXCEPT throw()
#else
#define NETWORK_URI_NOEXCEPT noexcept
#endif // defined(BOOST_NO_CXX11_NOEXCEPT)

It noexcept seems to be a common issue - why not leave it back in - you
seemed to be doing something similar with the above macro - other
suggestions include:

http://stackoverflow.com/questions/18387640/how-to-deal-with-noexcept-in-visual-studio

BTW the way I build is to use the CMake from a parallel folder
network-uri-build-x64 as follows:

cmake -D BOOST_ROOT=../boost_1_56_0/ -D
BOOST_LIBRARYDIR=../boost_1_56_0/lib64-msvc-12.0/ -D
GTEST_INCLUDE_DIR=../gtest-1.7.0/include/ -D
GTEST_LIBRARY=../gtest-1.7.0-build-x64/Release/gtest.lib -D
GTEST_MAIN_LIBRARY=../gtest-1.7.0-build-x64/Release/gtest_main.lib -D
Boost_FILESYSTEM_LIBRARY_DEBUG=../boost_1_56_0/lib64-msvc-12.0/boost_filesystem-vc120-mt-gd-1_56.lib
-D
Boost_FILESYSTEM_LIBRARY_RELEASE=../boost_1_56_0/lib64-msvc-12.0/boost_filesystem-vc120-mt-1_56.lib-D
Boost_SYSTEM_LIBRARY_DEBUG=../boost_1_56_0/lib64-msvc-12.0/boost_system-vc120-mt-gd-1_56.lib
-D
Boost_SYSTEM_LIBRARY_RELEASE=../boost_1_56_0/lib64-msvc-12.0/boost_system-vc120-mt-1_56.lib
-D Boost_LIBRARY_DIR=../boost_1_56_0/lib64-msvc-12.0/ -G "Visual Studio 12
Win64" ../uri-master -Wno-dev

Then I just fire up and build with visual studio and it used to work. BTW
to ran into some issues with the Boost.Optional changes in the latest
version of boost, specifically with the redirection operator, I noticed you
had some

On Sat, Sep 20, 2014 at 2:37 PM, Glyn Matthews [email protected]
wrote:

I've periodically made some updates to the URI code over the last months
(including the fixing errors related to the Boost.Optional situation). I'd
appreciate it if you'd check and merge these changes, @deanberris

https://github.com/deanberris.

You can merge this Pull Request by running

git pull https://github.com/glynos/uri master

Or view, comment on, or merge it at:

#52
Commit Summary

• Added some extra tests for the scheme; removed some incorrect tests.
• Fixed up resolve tests.
• Fixed encoding tests.
• Given up hope of compiling MSVC 2013, so I'm removing the macros.
• Fixed failing builds due to removals in previous commit.
• Fixed tests so that they compile for Boost.Optional in 1.56.
• Removed tests that are actually expected to fail.

File Changes

• M src/detail/uri_parse.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-0 (4)
• M src/network/uri/config.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-1 (8)
• M src/network/uri/detail/encode.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-2 (2)
• M src/network/uri/uri.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-3 (60)
• M src/network/uri/uri_builder.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-4 (4)
• M src/network/uri/uri_errors.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-5 (8)
• M src/network/uri/uri_io.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-6 (4)
• M src/uri.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-7 (20)
• M src/uri_builder.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-8 (2)
• M src/uri_errors.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-9 (14)
• M test/uri_builder_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-10 (26)
• M test/uri_encoding_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-11 (2)
• M test/uri_reference_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-12 (40)
• M test/uri_resolve_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-13 (173)
• M test/uri_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-14 (113)

Patch Links:

• https://github.com/cpp-netlib/uri/pull/52.patch
• https://github.com/cpp-netlib/uri/pull/52.diff

—
Reply to this email directly or view it on GitHub
#52.

[johnco3]

Glynn,

$ git revert --no-commit b0a2568

seemed to do the trick, now I am back building with visual studio

John

On Sat, Sep 20, 2014 at 2:37 PM, Glyn Matthews [email protected]
wrote:

I've periodically made some updates to the URI code over the last months
(including the fixing errors related to the Boost.Optional situation). I'd
appreciate it if you'd check and merge these changes, @deanberris

https://github.com/deanberris.

You can merge this Pull Request by running

git pull https://github.com/glynos/uri master

Or view, comment on, or merge it at:

#52
Commit Summary

• Added some extra tests for the scheme; removed some incorrect tests.
• Fixed up resolve tests.
• Fixed encoding tests.
• Given up hope of compiling MSVC 2013, so I'm removing the macros.
• Fixed failing builds due to removals in previous commit.
• Fixed tests so that they compile for Boost.Optional in 1.56.
• Removed tests that are actually expected to fail.

File Changes

• M src/detail/uri_parse.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-0 (4)
• M src/network/uri/config.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-1 (8)
• M src/network/uri/detail/encode.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-2 (2)
• M src/network/uri/uri.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-3 (60)
• M src/network/uri/uri_builder.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-4 (4)
• M src/network/uri/uri_errors.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-5 (8)
• M src/network/uri/uri_io.hpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-6 (4)
• M src/uri.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-7 (20)
• M src/uri_builder.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-8 (2)
• M src/uri_errors.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-9 (14)
• M test/uri_builder_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-10 (26)
• M test/uri_encoding_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-11 (2)
• M test/uri_reference_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-12 (40)
• M test/uri_resolve_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-13 (173)
• M test/uri_test.cpp
  https://github.com/cpp-netlib/uri/pull/52/files#diff-14 (113)

Patch Links:

• https://github.com/cpp-netlib/uri/pull/52.patch
• https://github.com/cpp-netlib/uri/pull/52.diff

—
Reply to this email directly or view it on GitHub
#52.

[glynos]

I did the revert, could you confirm that it works for you?

[deanberris]

LGTM -- I'm happy for you guys (@glynos and @johnco3) to iterate on this later on too. Merging now, thanks @glynos!

[johnco3]

Glynn, sorry for the tardy reply ,I just checked my email and ran a quick
build - I just verified that the reverted change compiles and seems to
run just fine - thanks.

BTW, I'm not sure but is optional::reset not deprecated? I see that you
use the rest quite a lot in the uri. The deprecation suggests the
assignment operator, i.e. assign boost::none to the fields that need
resetting?

All the best

John

On Sun, Sep 21, 2014 at 4:22 AM, Glyn Matthews [email protected]
wrote:

I did the revert, could you confirm that it works for you?

—
Reply to this email directly or view it on GitHub
#52 (comment).

[glynos]

John,
Thanks for taking a look and noticing. I'll update the code when I have time.

[johnco3]

My pleasure.

John
On Sep 23, 2014 7:06 AM, "Glyn Matthews" [email protected] wrote:

John,
Thanks for taking a look and noticing. I'll update the code when I have
time.

—
Reply to this email directly or view it on GitHub
#52 (comment).