diff mbox

[Branch,~unity-team/nux/trunk] Rev 885: debian/control: add libgtest-dev to build-dependency

Message ID 20170112012326.32180.63698.launchpad@ackee.canonical.com
State New
Headers show

Commit Message

noreply@launchpad.net Jan. 12, 2017, 1:23 a.m. UTC 
Merge authors:
  Marco Trevisan (Treviño) (3v1n0)
Related merge proposals:
  https://code.launchpad.net/~3v1n0/nux/gtest-dependency/+merge/314424
  proposed by: Marco Trevisan (Treviño) (3v1n0)
  review: Approve - Andrea Azzarone (azzar1)
------------------------------------------------------------
revno: 885 [merge]
author: Marco Trevisan (Treviño) <mail@3v1n0.net>
committer: Bileto Bot <ci-train-bot@canonical.com>
branch nick: nux
timestamp: Tue 2017-01-10 14:29:32 +0000
message:
  debian/control: add libgtest-dev to build-dependency
modified:
  NuxCore/PropertyAnimation.h
  autogen.sh
  debian/control
  tests/gtest-nuxcore-animation.cpp


--
lp:nux
https://code.launchpad.net/~unity-team/nux/trunk

You are subscribed to branch lp:nux.
To unsubscribe from this branch go to https://code.launchpad.net/~unity-team/nux/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'NuxCore/PropertyAnimation.h'
--- NuxCore/PropertyAnimation.h	2016-07-22 09:35:47 +0000
+++ NuxCore/PropertyAnimation.h	2017-01-10 14:24:57 +0000
@@ -37,7 +37,7 @@ 
                                                     T const& finish,
                                                     int ms_duration)
 {
-  std::shared_ptr<AnimateValue<T> > anim(new AnimateValue<T>(start, finish, ms_duration));
+  auto anim = std::make_shared<AnimateValue<T>>(start, finish, ms_duration);
   anim->updated.connect([&prop](T const& v) { prop = v; });
   return anim;
 }

=== modified file 'autogen.sh'
--- autogen.sh	2016-07-22 09:35:47 +0000
+++ autogen.sh	2017-01-10 14:25:59 +0000
@@ -2,8 +2,6 @@ 
 
 srcdir=`dirname $0`
 
-#PKG_NAME="Nux"
-
 which gnome-autogen.sh || {
 	echo "You need gnome-common from GNOME SVN"
 	exit 1

=== modified file 'debian/control'
--- debian/control	2016-11-07 01:24:23 +0000
+++ debian/control	2017-01-10 12:51:14 +0000
@@ -13,6 +13,7 @@ 
                libboost-filesystem-dev,
                libboost-system-dev,
                google-mock (>= 1.6.0+svn437),
+               libgtest-dev,
                libcairo2-dev (>= 1.9.14),
                libpng-dev,
                libglewmx-dev [!armel !armhf],

=== 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:19:28 +0000
@@ -21,8 +21,6 @@ 
 
 #include <gmock/gmock.h>
 
-#include <boost/shared_ptr.hpp>
-
 namespace na = nux::animation;
 namespace nt = nux::testing;
 
@@ -789,7 +787,7 @@ 
   nux::Property<int> int_property;
   EXPECT_THAT(int_property(), Eq(0));
 
-  boost::shared_ptr<na::AnimateValue<int> > anim = na::animate_property(int_property, 10, 20, 1000);
+  std::shared_ptr<na::AnimateValue<int> > anim = na::animate_property(int_property, 10, 20, 1000);
   anim->finished.connect([&anim]() {anim.reset();});
 
   anim->Start();