Nux

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

Proposed by Marco Trevisan (Treviño) on 2017-01-10
Status: Merged
Approved by: Andrea Azzarone on 2017-01-10
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) 2017-01-10 Approve on 2017-01-10
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.
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches