From patchwork Thu Jan 12 01:23:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: noreply@launchpad.net X-Patchwork-Id: 91019 Delivered-To: patches@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1399201qgi; Wed, 11 Jan 2017 17:23:27 -0800 (PST) X-Received: by 10.84.218.77 with SMTP id f13mr17569870plm.141.1484184207652; Wed, 11 Jan 2017 17:23:27 -0800 (PST) Return-Path: Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id q10si1487429pfc.45.2017.01.11.17.23.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 11 Jan 2017 17:23:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mailfrom=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.76 #1 (Debian)) id 1cRU6w-00088h-7C for ; Thu, 12 Jan 2017 01:23:26 +0000 Received: from ackee.canonical.com (unknown [IPv6:::1]) by ackee.canonical.com (Postfix) with ESMTP id 284D7E0149 for ; Thu, 12 Jan 2017 01:23:26 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Message-For: patches-linaro X-Launchpad-Notification-Type: branch-revision X-Launchpad-Branch: ~unity-team/nux/trunk X-Launchpad-Project: nux X-Launchpad-Branch-Revision-Number: 884 To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Thu, 12 Jan 2017 01:23:26 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="18302"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 50d16a60c924951b04e05b19e194d8b5653520b2 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 , Eleni Maria Stea committer: Bileto Bot 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 === 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 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 #include #include -#include #if defined(NUX_OS_WINDOWS) #define __func__ __FUNCTION__ @@ -134,7 +134,7 @@ class LoggerModule; -typedef boost::shared_ptr LoggerModulePtr; +typedef std::shared_ptr 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 Ptr; + typedef std::shared_ptr 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 #include "Animation.h" #include "Property.h" -#include - namespace nux { namespace animation { template -boost::shared_ptr> animate_property(Property& prop, +std::shared_ptr> animate_property(Property& prop, T const& start, T const& finish, int ms_duration) { - boost::shared_ptr > anim(new AnimateValue(start, finish, ms_duration)); + std::shared_ptr > anim(new AnimateValue(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