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

Windows build fixes #2352

Merged
merged 2 commits into from Nov 21, 2019
Merged

Conversation

@MonsieurNicolas
Copy link
Contributor

MonsieurNicolas commented Nov 20, 2019

No description provided.

@MonsieurNicolas MonsieurNicolas added this to In progress in v12.2.0 via automation Nov 20, 2019
@@ -2397,7 +2397,8 @@ LedgerTxnRoot::Impl::getBestOffer(Asset const& buying, Asset const& selling,
prefetch(toPrefetch);

cached->allLoaded =
std::distance(newOfferIter, offers.cend()) < BATCH_SIZE;
static_cast<size_t>(std::distance(newOfferIter, offers.cend())) <

This comment has been minimized.

Copy link
@jonjove

jonjove Nov 20, 2019

Contributor

Exactly the same thing appears on line 2310. Is there no warning there?

This comment has been minimized.

Copy link
@MonsieurNicolas

MonsieurNicolas Nov 20, 2019

Author Contributor

interestingly it wasn't... regardless, I fixed the other call site to be consistent

@MonsieurNicolas MonsieurNicolas force-pushed the MonsieurNicolas:windowsBuild20191120 branch from fa9b824 to abcfe2c Nov 20, 2019
@MonsieurNicolas

This comment has been minimized.

Copy link
Contributor Author

MonsieurNicolas commented Nov 20, 2019

@jonjove updated

@jonjove

This comment has been minimized.

Copy link
Contributor

jonjove commented Nov 20, 2019

r+ abcfe2c

@latobarita

This comment has been minimized.

Copy link
Contributor

latobarita commented on abcfe2c Nov 20, 2019

saw approval from jonjove
at MonsieurNicolas@abcfe2c

This comment has been minimized.

Copy link
Contributor

latobarita replied Nov 20, 2019

merging MonsieurNicolas/stellar-core/windowsBuild20191120 = abcfe2c into auto

This comment has been minimized.

Copy link
Contributor

latobarita replied Nov 20, 2019

MonsieurNicolas/stellar-core/windowsBuild20191120 = abcfe2c merged ok, testing candidate = fefaa96

This comment has been minimized.

This comment has been minimized.

Copy link
Contributor

latobarita replied Nov 21, 2019

fast-forwarding master to auto = fefaa96

latobarita added a commit that referenced this pull request Nov 20, 2019
Windows build fixes

Reviewed-by: jonjove
@latobarita latobarita merged commit abcfe2c into stellar:master Nov 21, 2019
1 check passed
1 check passed
default all tests passed
Details
v12.2.0 automation moved this from In progress to Done Nov 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
v12.2.0
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.