FreeBSD Bugzilla – Attachment 150490 Details for
Bug 195904
devel/vxlog: fix build with libc++
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
vxlog.patch (text/plain), 5.22 KB, created by
Dmitry Marakasov
on 2014-12-12 01:10:15 UTC
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Dmitry Marakasov
Created:
2014-12-12 01:10:15 UTC
Size:
5.22 KB
patch
obsolete
>Index: files/patch-src__vxlog__console-outputter.h >=================================================================== >--- files/patch-src__vxlog__console-outputter.h (revision 0) >+++ files/patch-src__vxlog__console-outputter.h (working copy) >@@ -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 >+ > >Property changes on: files/patch-src__vxlog__console-outputter.h >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Index: files/patch-src__vxlog__file-outputter.h >=================================================================== >--- files/patch-src__vxlog__file-outputter.h (revision 0) >+++ files/patch-src__vxlog__file-outputter.h (working copy) >@@ -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 >+ > >Property changes on: files/patch-src__vxlog__file-outputter.h >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Index: files/patch-src__vxlog__logger.h >=================================================================== >--- files/patch-src__vxlog__logger.h (revision 0) >+++ files/patch-src__vxlog__logger.h (working copy) >@@ -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(); > >Property changes on: files/patch-src__vxlog__logger.h >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Index: files/patch-src__vxlog__outputter-interface.h >=================================================================== >--- files/patch-src__vxlog__outputter-interface.h (revision 0) >+++ files/patch-src__vxlog__outputter-interface.h (working copy) >@@ -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 >+ > >Property changes on: files/patch-src__vxlog__outputter-interface.h >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Index: files/patch-src__vxlog__syslog-outputter.h >=================================================================== >--- files/patch-src__vxlog__syslog-outputter.h (revision 0) >+++ files/patch-src__vxlog__syslog-outputter.h (working copy) >@@ -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 >+ > >Property changes on: files/patch-src__vxlog__syslog-outputter.h >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 195904
: 150490