Nux

Merge lp://qastaging/~hikiko/nux/nux.fixed-smart-ptr into lp://qastaging/nux

  1. nux.fixed-smart-ptr
  2. Merge into trunk
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
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+300293@code.qastaging.launchpad.net

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.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Using std ones is preferred. Please just include <memory>.

Revision history for this message
Eleni Maria Stea (hikiko) wrote :

It still doesn't compile in all systems if I just include <memory>. Added c++11 CXXFLAGS and replaced the boost smart pointers with std.

lp://qastaging/~hikiko/nux/nux.fixed-smart-ptr updated
884. By Eleni Maria Stea

removed empty line (cleanup diff)

885. By Eleni Maria Stea

fixed diff

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches