Switched to the use of std::shared_ptr in xGadgetron and stir::shared_ptr in xSTIR. Generally, different SIRF engines can now use different shared_ptr (as specified in *_shared_ptr,h).
https://github.com/CCPPETMR/SIRF/pull/62
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.
@casperdcl do you have any idea why github claims that this PR contains so many commits? This PR is based on master, which was merged to devel recently, from which this branch was created. I guess the git merge won't be a problem, but I'd like to understand this a bit more.
@evgueni-ovtchinnikov I had a brief look at this. It seems a bit of a hack to me. I guess it works so I'm ok with merging it, but I'm generally quite warry of solving this stuff with #define
. Also, it seems we have twice object_handle.inl
(identical?) .
I'm not 100% sure, but I guess what you'd need is to have an extra template arg for your ObjectHandle
class (and others?)
FYI, modifying CMake files:
include_directories(${PROJECT_SOURCE_DIR}/src/common/include)
#include "SIRF/common/object_handle.inl"
I wouldn't do this right now, as we want to avoid the #define
trick later (it's not good programming style, and I'm worried that we'll have a conflict at some point).
can you merge with master locally first. looks like you'll have conflicts.
ok. please push
Merged #62.
Merged manually