From owner-svn-ports-all@FreeBSD.ORG Wed Jan 14 19:04:37 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8C44B45; Wed, 14 Jan 2015 19:04:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9AF11C46; Wed, 14 Jan 2015 19:04:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0EJ4bMj053595; Wed, 14 Jan 2015 19:04:37 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0EJ4aM0053555; Wed, 14 Jan 2015 19:04:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201501141904.t0EJ4aM0053555@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 14 Jan 2015 19:04:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377038 - head/devel/vxlog/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jan 2015 19:04:37 -0000 Author: amdmi3 Date: Wed Jan 14 19:04:35 2015 New Revision: 377038 URL: https://svnweb.freebsd.org/changeset/ports/377038 QAT: https://qat.redports.org/buildarchive/r377038/ Log: - Use correct namespace for shared_ptr with libc++, fixes build on 10+ PR: 195904 Submitted by: amdmi3 Approved by: maintainer timeout Added: head/devel/vxlog/files/ head/devel/vxlog/files/patch-src__vxlog__console-outputter.h (contents, props changed) head/devel/vxlog/files/patch-src__vxlog__file-outputter.h (contents, props changed) head/devel/vxlog/files/patch-src__vxlog__logger.h (contents, props changed) head/devel/vxlog/files/patch-src__vxlog__outputter-interface.h (contents, props changed) head/devel/vxlog/files/patch-src__vxlog__syslog-outputter.h (contents, props changed) Added: head/devel/vxlog/files/patch-src__vxlog__console-outputter.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/vxlog/files/patch-src__vxlog__console-outputter.h Wed Jan 14 19:04:35 2015 (r377038) @@ -0,0 +1,14 @@ +--- src/vxlog/console-outputter.h.orig 2010-10-18 17:23:04.000000000 +0400 ++++ src/vxlog/console-outputter.h 2014-12-12 03:12:09.000000000 +0300 +@@ -52,7 +52,11 @@ + VXLOG_DISALLOW_COPY_AND_ASSIGN(ConsoleOutputter); + }; + ++#ifdef _LIBCPP_VERSION ++typedef std::shared_ptr ConsoleOutputterPtr; ++#else + typedef std::tr1::shared_ptr ConsoleOutputterPtr; ++#endif + + } // namespace vxlog + Added: head/devel/vxlog/files/patch-src__vxlog__file-outputter.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/vxlog/files/patch-src__vxlog__file-outputter.h Wed Jan 14 19:04:35 2015 (r377038) @@ -0,0 +1,14 @@ +--- src/vxlog/file-outputter.h.orig 2010-10-18 17:23:04.000000000 +0400 ++++ src/vxlog/file-outputter.h 2014-12-12 03:47:01.000000000 +0300 +@@ -87,7 +87,11 @@ + VXLOG_DISALLOW_COPY_AND_ASSIGN(FileOutputter); + }; + ++#ifdef _LIBCPP_VERSION ++typedef std::shared_ptr FileOutputterPtr; ++#else + typedef std::tr1::shared_ptr FileOutputterPtr; ++#endif + + } // namespace vxlog + Added: head/devel/vxlog/files/patch-src__vxlog__logger.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/vxlog/files/patch-src__vxlog__logger.h Wed Jan 14 19:04:35 2015 (r377038) @@ -0,0 +1,15 @@ +--- src/vxlog/logger.h.orig 2010-10-18 17:23:04.000000000 +0400 ++++ src/vxlog/logger.h 2014-12-12 03:13:44.000000000 +0300 +@@ -45,7 +45,12 @@ + + template + static void BindOutputter(Level::Type level, ++#ifdef _LIBCPP_VERSION ++ std::shared_ptr outputter) { ++#else + std::tr1::shared_ptr outputter) { ++#endif ++ + OutputterHolder::Reset(); + OutputterHolder::Reset(); + OutputterHolder::Reset(); Added: head/devel/vxlog/files/patch-src__vxlog__outputter-interface.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/vxlog/files/patch-src__vxlog__outputter-interface.h Wed Jan 14 19:04:35 2015 (r377038) @@ -0,0 +1,14 @@ +--- src/vxlog/outputter-interface.h.orig 2010-10-18 17:23:04.000000000 +0400 ++++ src/vxlog/outputter-interface.h 2014-12-12 03:46:20.000000000 +0300 +@@ -37,7 +37,11 @@ + virtual void Flush() = 0; + }; + ++#ifdef _LIBCPP_VERSION ++typedef std::shared_ptr SharedOutputterPtr; ++#else + typedef std::tr1::shared_ptr SharedOutputterPtr; ++#endif + + } // namespace vxlog + Added: head/devel/vxlog/files/patch-src__vxlog__syslog-outputter.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/vxlog/files/patch-src__vxlog__syslog-outputter.h Wed Jan 14 19:04:35 2015 (r377038) @@ -0,0 +1,14 @@ +--- src/vxlog/syslog-outputter.h.orig 2010-10-18 17:23:04.000000000 +0400 ++++ src/vxlog/syslog-outputter.h 2014-12-12 03:13:03.000000000 +0300 +@@ -49,7 +49,11 @@ + VXLOG_DISALLOW_COPY_AND_ASSIGN(SyslogOutputter); + }; + ++#ifdef _LIBCPP_VERSION ++typedef std::shared_ptr SyslogOutputterPtr; ++#else + typedef std::tr1::shared_ptr SyslogOutputterPtr; ++#endif + + } // namespace vxlog +