Nux

Merge lp:~3v1n0/nux/gtest-dependency into lp:nux

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: 888
Merged at revision: 885
Proposed branch: lp:~3v1n0/nux/gtest-dependency
Merge into: lp:nux
Prerequisite: lp:~hikiko/nux/nux.fixed-smart-ptr
Diff against target: 59 lines (+3/-6)
4 files modified
NuxCore/PropertyAnimation.h (+1/-1)
autogen.sh (+0/-2)
debian/control (+1/-0)
tests/gtest-nuxcore-animation.cpp (+1/-3)
To merge this branch: bzr merge lp:~3v1n0/nux/gtest-dependency
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+314424@code.launchpad.net

This proposal supersedes a proposal from 2017-01-10.

Commit message

debian/control: add libgtest-dev to build-dependency

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NuxCore/PropertyAnimation.h'
--- NuxCore/PropertyAnimation.h 2017-01-10 14:26:52 +0000
+++ NuxCore/PropertyAnimation.h 2017-01-10 14:26:52 +0000
@@ -37,7 +37,7 @@
37 T const& finish,37 T const& finish,
38 int ms_duration)38 int ms_duration)
39{39{
40 std::shared_ptr<AnimateValue<T> > anim(new AnimateValue<T>(start, finish, ms_duration));40 auto anim = std::make_shared<AnimateValue<T>>(start, finish, ms_duration);
41 anim->updated.connect([&prop](T const& v) { prop = v; });41 anim->updated.connect([&prop](T const& v) { prop = v; });
42 return anim;42 return anim;
43}43}
4444
=== modified file 'autogen.sh'
--- autogen.sh 2017-01-10 14:26:52 +0000
+++ autogen.sh 2017-01-10 14:26:52 +0000
@@ -2,8 +2,6 @@
22
3srcdir=`dirname $0`3srcdir=`dirname $0`
44
5#PKG_NAME="Nux"
6
7which gnome-autogen.sh || {5which gnome-autogen.sh || {
8 echo "You need gnome-common from GNOME SVN"6 echo "You need gnome-common from GNOME SVN"
9 exit 17 exit 1
108
=== modified file 'debian/control'
--- debian/control 2016-11-07 01:24:23 +0000
+++ debian/control 2017-01-10 14:26:52 +0000
@@ -13,6 +13,7 @@
13 libboost-filesystem-dev,13 libboost-filesystem-dev,
14 libboost-system-dev,14 libboost-system-dev,
15 google-mock (>= 1.6.0+svn437),15 google-mock (>= 1.6.0+svn437),
16 libgtest-dev,
16 libcairo2-dev (>= 1.9.14),17 libcairo2-dev (>= 1.9.14),
17 libpng-dev,18 libpng-dev,
18 libglewmx-dev [!armel !armhf],19 libglewmx-dev [!armel !armhf],
1920
=== modified file 'tests/gtest-nuxcore-animation.cpp'
--- tests/gtest-nuxcore-animation.cpp 2015-09-16 01:31:56 +0000
+++ tests/gtest-nuxcore-animation.cpp 2017-01-10 14:26:52 +0000
@@ -21,8 +21,6 @@
2121
22#include <gmock/gmock.h>22#include <gmock/gmock.h>
2323
24#include <boost/shared_ptr.hpp>
25
26namespace na = nux::animation;24namespace na = nux::animation;
27namespace nt = nux::testing;25namespace nt = nux::testing;
2826
@@ -789,7 +787,7 @@
789 nux::Property<int> int_property;787 nux::Property<int> int_property;
790 EXPECT_THAT(int_property(), Eq(0));788 EXPECT_THAT(int_property(), Eq(0));
791789
792 boost::shared_ptr<na::AnimateValue<int> > anim = na::animate_property(int_property, 10, 20, 1000);790 std::shared_ptr<na::AnimateValue<int> > anim = na::animate_property(int_property, 10, 20, 1000);
793 anim->finished.connect([&anim]() {anim.reset();});791 anim->finished.connect([&anim]() {anim.reset();});
794792
795 anim->Start();793 anim->Start();

Subscribers

People subscribed via source and target branches