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

Proposed 1.8.0-b2 #3807

Closed
wants to merge 9 commits into from
Closed

Conversation

manojsdoshi
Copy link
Contributor

If merged this PR will:

close #3787
close #3774
close #3786
close #3785
close #3784
close #3791
close #3590
close #3793

@@ -80,8 +79,7 @@ class ProtocolVersion_test : public beast::unit_test::suite
{
testcase("Protocol version negotiation");

BEAST_EXPECT(
negotiateProtocolVersion("RTXP/1.2") == make_protocol(1, 2));
BEAST_EXPECT(negotiateProtocolVersion("RTXP/1.2") == boost::none);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Change boost::none to std::nullopt.

@scottschurr
Copy link
Collaborator

This is not building for me on MacOS. The ProtocolVersion_test.cpp file in this commit needs to be patched: 92a9c8c

On line 82 change boost::none to std::nullopt: 92a9c8c#r605779214

@manojsdoshi manojsdoshi closed this Apr 1, 2021
Comment on lines +542 to +543
using namespace boost::filesystem;
path dbPath = setup.dataDir / TxDBName;
Copy link
Collaborator

Choose a reason for hiding this comment

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

The boost::filesystem::path is hidden by the declaration of namespace ripple::path in src/ripple/app/paths/Types.h and elsewhere. Replace these two lines with

boost::filesystem::path dbPath = setup.dataDir / TxDBName;

@scottschurr
Copy link
Collaborator

The unity build is not working for me either. The RelationalDBInterface pull request (#3590) needs a fix on line 542 of RelationalDBInterface_plobal.cpp. Replace

using namespace boost::filesystem;
path dbPath = setup.dataDir / TxDBName;

with

boost::filesystem::path dbPath = setup.dataDir / TxDBName;

Here's a link to the comment: 5d7f0f8#r605808653

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.

7 participants