[Branch,~unity-team/nux/trunk] Rev 884: replaced std::shared_ptr with boost::shared_ptr to fix compile errors

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

Commit Message

noreply@launchpad.net Jan. 12, 2017, 1:23 a.m.
Merge authors:
  Eleni Maria Stea (hikiko)
  Eleni Maria Stea (hikiko)
Related merge proposals:
  https://code.launchpad.net/~hikiko/nux/nux.fixed-smart-ptr/+merge/300293
  proposed by: Eleni Maria Stea (hikiko)
  review: Approve - Marco Trevisan (Treviño) (3v1n0)
------------------------------------------------------------
revno: 884 [merge]
author: Eleni Maria Stea <elene.mst@gmail.com>, Eleni Maria Stea <elenimaria.stea@canonical.com>
committer: Bileto Bot <ci-train-bot@canonical.com>
branch nick: nux
timestamp: Tue 2017-01-10 14:29:17 +0000
message:
  replaced std::shared_ptr with boost::shared_ptr to fix compile errors
  
  Approved by: Marco Trevisan (Treviño)
modified:
  Nux/TimerProc.h
  NuxCore/Logger.h
  NuxCore/LoggingWriter.cpp
  NuxCore/PropertyAnimation.h
  autogen.sh
  configure.ac


--
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

Patch hide | download patch | download mbox

=== modified file 'Nux/TimerProc.h'
--- Nux/TimerProc.h	2015-07-28 10:47:57 +0000
+++ Nux/TimerProc.h	2016-07-22 09:53:28 +0000
@@ -23,6 +23,7 @@ 
 #ifndef TIMERPROC_H
 #define TIMERPROC_H
 
+#include <memory>
 namespace nux
 {
 

=== modified file 'NuxCore/Logger.h'
--- NuxCore/Logger.h	2012-10-28 15:59:17 +0000
+++ NuxCore/Logger.h	2016-07-22 09:35:47 +0000
@@ -22,9 +22,9 @@ 
 #ifndef NUX_CORE_LOGGER_H
 #define NUX_CORE_LOGGER_H
 
+#include <memory>
 #include <ostream>
 #include <string>
-#include <boost/shared_ptr.hpp>
 
 #if defined(NUX_OS_WINDOWS)
   #define __func__ __FUNCTION__
@@ -134,7 +134,7 @@ 
 
 
 class LoggerModule;
-typedef boost::shared_ptr<LoggerModule> LoggerModulePtr;
+typedef std::shared_ptr<LoggerModule> LoggerModulePtr;
 
 class Logger
 {

=== modified file 'NuxCore/LoggingWriter.cpp'
--- NuxCore/LoggingWriter.cpp	2012-11-17 14:11:02 +0000
+++ NuxCore/LoggingWriter.cpp	2016-07-22 09:35:47 +0000
@@ -47,7 +47,7 @@ 
 
 struct StreamWrapper
 {
-  typedef boost::shared_ptr<StreamWrapper> Ptr;
+  typedef std::shared_ptr<StreamWrapper> Ptr;
 
   StreamWrapper(std::ostream& output) : out(output) {}
   std::ostream& out;

=== modified file 'NuxCore/PropertyAnimation.h'
--- NuxCore/PropertyAnimation.h	2012-07-13 05:24:25 +0000
+++ NuxCore/PropertyAnimation.h	2016-07-22 09:35:47 +0000
@@ -22,23 +22,22 @@ 
 #ifndef NUX_CORE_PROPERTY_ANIMATION_H
 #define NUX_CORE_PROPERTY_ANIMATION_H
 
+#include <memory>
 #include "Animation.h"
 #include "Property.h"
 
-#include <boost/shared_ptr.hpp>
-
 namespace nux
 {
 namespace animation
 {
 
 template <typename T>
-boost::shared_ptr<AnimateValue<T>> animate_property(Property<T>& prop,
+std::shared_ptr<AnimateValue<T>> animate_property(Property<T>& prop,
                                                     T const& start,
                                                     T const& finish,
                                                     int ms_duration)
 {
-  boost::shared_ptr<AnimateValue<T> > anim(new AnimateValue<T>(start, finish, ms_duration));
+  std::shared_ptr<AnimateValue<T> > anim(new AnimateValue<T>(start, finish, ms_duration));
   anim->updated.connect([&prop](T const& v) { prop = v; });
   return anim;
 }

=== modified file 'autogen.sh'
--- autogen.sh	2010-11-17 14:44:35 +0000
+++ autogen.sh	2016-07-22 09:35:47 +0000
@@ -2,13 +2,12 @@ 
 
 srcdir=`dirname $0`
 
-PKG_NAME="Nux"
+#PKG_NAME="Nux"
 
 which gnome-autogen.sh || {
 	echo "You need gnome-common from GNOME SVN"
 	exit 1
 }
 
-USE_GNOME2_MACROS=1 \
 . gnome-autogen.sh
 

=== modified file 'configure.ac'
--- configure.ac	2016-11-07 01:24:23 +0000
+++ configure.ac	2017-01-10 14:29:17 +0000
@@ -93,6 +93,7 @@ 
 dnl ===========================================================================
 
 # Checks for programs
+AM_CXXFLAGS-"$CXXFLAGS -std=c++0x"
 AC_PROG_CC_C99
 AC_PROG_CXX
 AM_PROG_CC_C_O