-
Notifications
You must be signed in to change notification settings - Fork 13
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
Used boost::shared_ptr throughout for memory management #1
Open
cce
wants to merge
35
commits into
brownie:master
Choose a base branch
from
cce:shared_ptr-merge
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… '\(\(const \)?[A-Za-z:]+\)\( \)?\*\( \)?\([^/]\)' with 'Ptr<\1> \5'
…' -> 'new_ptr<\1>' in all files)
…. seems to compile..
Conflicts: src/GroupRSA.h src/Makefile src/Test.cpp src/bank.80.params src/public.80.arbiter src/public.regular.80.arbiter src/secret.80.arbiter src/secret.regular.80.arbiter src/tool.80.bank src/tool.80.user src/wallet.80
This reverts commit bcb2114.
Conflicts: src/bank.80.params src/tool.80.bank src/wallet.80
This reverts commit 3163f13.
Conflicts: src/bank.80.params src/public.80.arbiter src/public.regular.80.arbiter src/secret.80.arbiter src/secret.regular.80.arbiter src/tool.80.bank src/tool.80.user src/wallet.80
…ation power caching
resolved conflicts with git mergetool & DiffMerge Conflicts: src/BuyMessage.h src/Buyer.cpp src/Debug.h src/FEInitiator.cpp src/FEResponder.cpp src/GroupRSA.h src/Seller.cpp src/Test.cpp src/ZKP/Interpreter.cpp src/ZKP/examples/cl-obtain-temp.txt src/bank.80.params src/tool.80.bank src/wallet.80
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR brings in changes from the long-running shared_ptr feature branch, merged with the latest from brownie/master. It replaces all the new & delete with reference-counted boost::shared_ptr & boost::make_shared.