Merge lp://qastaging/~hikiko/nux/nux.fixed-smart-ptr into lp://qastaging/nux
Proposed by
Eleni Maria Stea
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | 885 |
Merged at revision: | 884 |
Proposed branch: | lp://qastaging/~hikiko/nux/nux.fixed-smart-ptr |
Merge into: | lp://qastaging/nux |
Diff against target: |
110 lines (+9/-9) 6 files modified
Nux/TimerProc.h (+1/-0) NuxCore/Logger.h (+2/-2) NuxCore/LoggingWriter.cpp (+1/-1) NuxCore/PropertyAnimation.h (+3/-4) autogen.sh (+1/-2) configure.ac (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~hikiko/nux/nux.fixed-smart-ptr |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email:
|
Commit message
replaced std::shared_ptr with boost::shared_ptr to fix compile errors
Description of the change
replaced std::shared_ptr with boost::shared_ptr to fix compile errors
To post a comment you must log in.
Using std ones is preferred. Please just include <memory>.