svn commit: r377038 - head/devel/vxlog/files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Jan 14 19:04:37 UTC 2015
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<ConsoleOutputter> ConsoleOutputterPtr;
++#else
+ typedef std::tr1::shared_ptr<ConsoleOutputter> 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<FileOutputter> FileOutputterPtr;
++#else
+ typedef std::tr1::shared_ptr<FileOutputter> 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<typename OutputterT>
+ static void BindOutputter(Level::Type level,
++#ifdef _LIBCPP_VERSION
++ std::shared_ptr<OutputterT> outputter) {
++#else
+ std::tr1::shared_ptr<OutputterT> outputter) {
++#endif
++
+ OutputterHolder<ModuleT, Level::kDebug>::Reset();
+ OutputterHolder<ModuleT, Level::kInfo>::Reset();
+ OutputterHolder<ModuleT, Level::kWarn>::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<OutputterInterface> SharedOutputterPtr;
++#else
+ typedef std::tr1::shared_ptr<OutputterInterface> 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<SyslogOutputter> SyslogOutputterPtr;
++#else
+ typedef std::tr1::shared_ptr<SyslogOutputter> SyslogOutputterPtr;
++#endif
+
+ } // namespace vxlog
+
More information about the svn-ports-all
mailing list