Fix conditional inclusion of headers and namespace for shared_ptr#202
Merged
Conversation
This was referenced Jul 11, 2018
orenmnero
approved these changes
Jul 17, 2020
This file contains hidden or 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
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.
I wasn't being able to compile the project on CentOS 7.5 with
cmakebecause of a missing condition in the src/C++/Utility.h file.This PR fixes two things:
HAVE_STD_TR1_SHARED_PTRcondition where it was including<tr1/memory>instead of just<memory>HAVE_STD_TR1_SHARED_PTR_FROM_TR1_MEMORY_HEADERcondition to include<tr1/memory>and use the namespaceptr = std::tr1The solution is based on the content of the file cmake/FindSharedPtr.cmake:
This is the condition to set the
HAVE_STD_TR1_SHARED_PTRvariable:And this is the one to set
HAVE_STD_TR1_SHARED_PTR_FROM_TR1_MEMORY_HEADER: