Nux

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

  1. gtest-dependency
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Superseded
Proposed branch: lp:~3v1n0/nux/gtest-dependency
Merge into: lp:nux
Diff against target: 143 lines (+10/-13)
8 files modified
Nux/TimerProc.h (+1/-0)
NuxCore/Logger.h (+2/-2)
NuxCore/LoggingWriter.cpp (+1/-1)
NuxCore/PropertyAnimation.h (+3/-4)
autogen.sh (+0/-3)
configure.ac (+1/-0)
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
Unity Team Pending
Review via email: mp+314418@code.launchpad.net

This proposal has been superseded by a proposal from 2017-01-10.

Commit message

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

To post a comment you must log in.
lp:~3v1n0/nux/gtest-dependency updated
885. By Marco Trevisan (Treviño)

Merging with lp:~hikiko/nux/nux.fixed-smart-ptr

886. By Marco Trevisan (Treviño)

nuxcore-animation: use std shared_ptr

887. By Marco Trevisan (Treviño)

PropertyAnimation: use make_shared

888. By Marco Trevisan (Treviño)

autogen.sh: remove deprecated PKG_NAME

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/TimerProc.h'
2--- Nux/TimerProc.h 2015-07-28 10:47:57 +0000
3+++ Nux/TimerProc.h 2017-01-10 14:26:34 +0000
4@@ -23,6 +23,7 @@
5 #ifndef TIMERPROC_H
6 #define TIMERPROC_H
7
8+#include <memory>
9 namespace nux
10 {
11
12
13=== modified file 'NuxCore/Logger.h'
14--- NuxCore/Logger.h 2012-10-28 15:59:17 +0000
15+++ NuxCore/Logger.h 2017-01-10 14:26:34 +0000
16@@ -22,9 +22,9 @@
17 #ifndef NUX_CORE_LOGGER_H
18 #define NUX_CORE_LOGGER_H
19
20+#include <memory>
21 #include <ostream>
22 #include <string>
23-#include <boost/shared_ptr.hpp>
24
25 #if defined(NUX_OS_WINDOWS)
26 #define __func__ __FUNCTION__
27@@ -134,7 +134,7 @@
28
29
30 class LoggerModule;
31-typedef boost::shared_ptr<LoggerModule> LoggerModulePtr;
32+typedef std::shared_ptr<LoggerModule> LoggerModulePtr;
33
34 class Logger
35 {
36
37=== modified file 'NuxCore/LoggingWriter.cpp'
38--- NuxCore/LoggingWriter.cpp 2012-11-17 14:11:02 +0000
39+++ NuxCore/LoggingWriter.cpp 2017-01-10 14:26:34 +0000
40@@ -47,7 +47,7 @@
41
42 struct StreamWrapper
43 {
44- typedef boost::shared_ptr<StreamWrapper> Ptr;
45+ typedef std::shared_ptr<StreamWrapper> Ptr;
46
47 StreamWrapper(std::ostream& output) : out(output) {}
48 std::ostream& out;
49
50=== modified file 'NuxCore/PropertyAnimation.h'
51--- NuxCore/PropertyAnimation.h 2012-07-13 05:24:25 +0000
52+++ NuxCore/PropertyAnimation.h 2017-01-10 14:26:34 +0000
53@@ -22,23 +22,22 @@
54 #ifndef NUX_CORE_PROPERTY_ANIMATION_H
55 #define NUX_CORE_PROPERTY_ANIMATION_H
56
57+#include <memory>
58 #include "Animation.h"
59 #include "Property.h"
60
61-#include <boost/shared_ptr.hpp>
62-
63 namespace nux
64 {
65 namespace animation
66 {
67
68 template <typename T>
69-boost::shared_ptr<AnimateValue<T>> animate_property(Property<T>& prop,
70+std::shared_ptr<AnimateValue<T>> animate_property(Property<T>& prop,
71 T const& start,
72 T const& finish,
73 int ms_duration)
74 {
75- boost::shared_ptr<AnimateValue<T> > anim(new AnimateValue<T>(start, finish, ms_duration));
76+ auto anim = std::make_shared<AnimateValue<T>>(start, finish, ms_duration);
77 anim->updated.connect([&prop](T const& v) { prop = v; });
78 return anim;
79 }
80
81=== modified file 'autogen.sh'
82--- autogen.sh 2010-11-17 14:44:35 +0000
83+++ autogen.sh 2017-01-10 14:26:34 +0000
84@@ -2,13 +2,10 @@
85
86 srcdir=`dirname $0`
87
88-PKG_NAME="Nux"
89-
90 which gnome-autogen.sh || {
91 echo "You need gnome-common from GNOME SVN"
92 exit 1
93 }
94
95-USE_GNOME2_MACROS=1 \
96 . gnome-autogen.sh
97
98
99=== modified file 'configure.ac'
100--- configure.ac 2016-11-07 01:24:23 +0000
101+++ configure.ac 2017-01-10 14:26:34 +0000
102@@ -93,6 +93,7 @@
103 dnl ===========================================================================
104
105 # Checks for programs
106+AM_CXXFLAGS-"$CXXFLAGS -std=c++0x"
107 AC_PROG_CC_C99
108 AC_PROG_CXX
109 AM_PROG_CC_C_O
110
111=== modified file 'debian/control'
112--- debian/control 2016-11-07 01:24:23 +0000
113+++ debian/control 2017-01-10 14:26:34 +0000
114@@ -13,6 +13,7 @@
115 libboost-filesystem-dev,
116 libboost-system-dev,
117 google-mock (>= 1.6.0+svn437),
118+ libgtest-dev,
119 libcairo2-dev (>= 1.9.14),
120 libpng-dev,
121 libglewmx-dev [!armel !armhf],
122
123=== modified file 'tests/gtest-nuxcore-animation.cpp'
124--- tests/gtest-nuxcore-animation.cpp 2015-09-16 01:31:56 +0000
125+++ tests/gtest-nuxcore-animation.cpp 2017-01-10 14:26:34 +0000
126@@ -21,8 +21,6 @@
127
128 #include <gmock/gmock.h>
129
130-#include <boost/shared_ptr.hpp>
131-
132 namespace na = nux::animation;
133 namespace nt = nux::testing;
134
135@@ -789,7 +787,7 @@
136 nux::Property<int> int_property;
137 EXPECT_THAT(int_property(), Eq(0));
138
139- boost::shared_ptr<na::AnimateValue<int> > anim = na::animate_property(int_property, 10, 20, 1000);
140+ std::shared_ptr<na::AnimateValue<int> > anim = na::animate_property(int_property, 10, 20, 1000);
141 anim->finished.connect([&anim]() {anim.reset();});
142
143 anim->Start();

Subscribers

People subscribed via source and target branches