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

More simplifications #137

Merged
merged 25 commits into from Jun 19, 2019

Conversation

@pmconrad
Copy link

commented Jun 9, 2019

"Resolves" bitshares/bitshares-core#1584 and bitshares/bitshares-core#998 after core PR merged.
Requires additional changes in Core, see bitshares/bitshares-core#1789

@pmconrad pmconrad referenced this pull request Jun 9, 2019
@abitmore

This comment has been minimized.

Copy link
Member

commented Jun 10, 2019

The Travis CI build failed.

include/fc/thread/parallel.hpp Outdated Show resolved Hide resolved
include/fc/thread/thread.hpp Outdated Show resolved Hide resolved
include/fc/thread/thread.hpp Outdated Show resolved Hide resolved
include/fc/thread/task.hpp Outdated Show resolved Hide resolved
include/fc/variant.hpp Outdated Show resolved Hide resolved
include/fc/variant.hpp Outdated Show resolved Hide resolved
include/fc/variant.hpp Outdated Show resolved Hide resolved
include/fc/variant.hpp Outdated Show resolved Hide resolved
src/crypto/city.cpp Outdated Show resolved Hide resolved
src/io/fstream.cpp Show resolved Hide resolved
@pmconrad

This comment has been minimized.

Copy link
Author

commented Jun 10, 2019

Travis failure seems to be due to a gcc bug. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66297
Will undo for better compatibility and because the constexpr make little sense there. Hm, or perhaps make size a static member function?

@nathanhourt
Copy link

left a comment

Minor tweaks, and some questions

include/fc/thread/task.hpp Outdated Show resolved Hide resolved
include/fc/thread/task.hpp Outdated Show resolved Hide resolved
include/fc/variant.hpp Show resolved Hide resolved
src/thread/thread_d.hpp Outdated Show resolved Hide resolved
@nathanhourt
Copy link

left a comment

Looks good to me

@pmconrad pmconrad merged commit 6ed9431 into bitshares:master Jun 19, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pmconrad pmconrad deleted the pmconrad:1584_more_simplification branch Jun 19, 2019

@abitmore abitmore added this to the core release 3.3.0 milestone Aug 21, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
You can’t perform that action at this time.