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
Merged

Conversation

pmconrad
Copy link

@pmconrad pmconrad 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

@abitmore
Copy link
Member

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
Copy link
Author

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?

abitmore
abitmore previously approved these changes Jun 18, 2019
Copy link

@nathanielhourt nathanielhourt left a comment

Choose a reason for hiding this comment

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

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
Copy link

@nathanielhourt nathanielhourt left a comment

Choose a reason for hiding this comment

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

Looks good to me

@pmconrad pmconrad merged commit 6ed9431 into bitshares:master Jun 19, 2019
@pmconrad pmconrad deleted the 1584_more_simplification branch June 19, 2019 16:35
@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants