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

Jump to bottom

Remove shared ptr workarounds #4279

Merged
merged 1 commit into from Jun 16, 2014
Merged

Remove shared ptr workarounds #4279

merged 1 commit into from Jun 16, 2014

Conversation

wmtan
Copy link
Contributor

@wmtan wmtan commented Jun 16, 2014

This pull request removes two obsolete or unnecessary workarounds.

  1. The workaround to hide assembler code in boost::shared_ptr from cling (header boostWorkAround.h) is no longer needed, because all affected uses of boost::shared_ptr have already been replaced by std::shared_ptr.
  2. The ROOT 5 workaround to hide std::shared_ptr from gccxml (header HideStdSharedPtrFromRoot.h)
    is irrelevant in ROOT6. It was automatically forward ported from the main 7_2_X branch, but is not needed here.
    Please merge promptly, unless there are issues.

ktf added a commit that referenced this pull request Jun 16, 2014
@ktf
Merge pull request #4279 from wmtan/RemoveSharedPtrWorkarounds
b7d0bef 
Remove shared ptr workarounds
@ktf ktf merged commit b7d0bef into cms-sw:CMSSW_7_2_ROOT6_X Jun 16, 2014
@wmtan wmtan deleted the RemoveSharedPtrWorkarounds branch June 16, 2014 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@wmtan @ktf