Attachment 161124 Details for Bug 203160 – Fix devel/codeblocks build with clang 3.7.0

[patch] Fix devel/codeblocks build with clang 3.7.0

devel__codeblocks-fix-clang370-build-1.diff (text/plain), 3.32 KB, created by Dimitry Andric on 2015-09-16 20:01:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-09-16 20:01:28 UTC

Size: 3.32 KB

patch

obsolete

>Index: devel/codeblocks/Makefile
>===================================================================
>--- devel/codeblocks/Makefile	(revision 396254)
>+++ devel/codeblocks/Makefile	(working copy)
>@@ -38,6 +38,9 @@
> 
> .if ${CHOSEN_COMPILER_TYPE} == clang
> USE_CXXSTD=	c++11
>+. if ${COMPILER_VERSION} >= 35
>+CXXFLAGS+=	-Wno-undefined-bool-conversion
>+. endif
> .endif
> 
> .include <bsd.port.post.mk>
>Index: devel/codeblocks/files/patch-src__include__cbthreadpool.h
>===================================================================
>--- devel/codeblocks/files/patch-src__include__cbthreadpool.h	(revision 0)
>+++ devel/codeblocks/files/patch-src__include__cbthreadpool.h	(working copy)
>@@ -0,0 +1,73 @@
>+--- src/include/cbthreadpool.h.orig	2013-11-17 20:34:15.000000000 +0100
>++++ src/include/cbthreadpool.h	2015-09-16 21:19:53.385265000 +0200
>+@@ -15,6 +15,12 @@
>+ #include "settings.h"
>+ #include "prep.h"
>+ 
>++#if defined(__has_feature) && __has_feature(cxx_noexcept)
>++#define NOEXCEPT noexcept
>++#else
>++#define NOEXCEPT throw()
>++#endif
>++
>+ /// A Thread Pool implementation
>+ class DLLIMPORT cbThreadPool
>+ {
>+@@ -94,11 +100,11 @@ class DLLIMPORT cbThreadPool
>+ 
>+       public:
>+         explicit CountedPtr(T *p = 0);
>+-        CountedPtr(const CountedPtr<T> &p) throw();
>+-        ~CountedPtr() throw();
>+-        CountedPtr<T> &operator = (const CountedPtr<T> &p) throw();
>+-        T &operator * () const throw();
>+-        T *operator -> () const throw();
>++        CountedPtr(const CountedPtr<T> &p) NOEXCEPT;
>++        ~CountedPtr() NOEXCEPT;
>++        CountedPtr<T> &operator = (const CountedPtr<T> &p) NOEXCEPT;
>++        T &operator * () const NOEXCEPT;
>++        T *operator -> () const NOEXCEPT;
>+ 
>+       private:
>+         void dispose();
>+@@ -281,7 +287,7 @@ inline cbThreadPool::CountedPtr<T>::Coun
>+ }
>+ 
>+ template <typename T>
>+-inline cbThreadPool::CountedPtr<T>::CountedPtr(const CountedPtr<T> &p) throw()
>++inline cbThreadPool::CountedPtr<T>::CountedPtr(const CountedPtr<T> &p) NOEXCEPT
>+ : ptr(p.ptr),
>+   count(p.count)
>+ {
>+@@ -289,13 +295,13 @@ inline cbThreadPool::CountedPtr<T>::Coun
>+ }
>+ 
>+ template <typename T>
>+-inline cbThreadPool::CountedPtr<T>::~CountedPtr() throw()
>++inline cbThreadPool::CountedPtr<T>::~CountedPtr() NOEXCEPT
>+ {
>+   dispose();
>+ }
>+ 
>+ template <typename T>
>+-inline cbThreadPool::CountedPtr<T> &cbThreadPool::CountedPtr<T>::operator = (const CountedPtr<T> &p) throw()
>++inline cbThreadPool::CountedPtr<T> &cbThreadPool::CountedPtr<T>::operator = (const CountedPtr<T> &p) NOEXCEPT
>+ {
>+   if (this != &p)
>+   {
>+@@ -309,13 +315,13 @@ inline cbThreadPool::CountedPtr<T> &cbTh
>+ }
>+ 
>+ template <typename T>
>+-inline T &cbThreadPool::CountedPtr<T>::operator * () const throw()
>++inline T &cbThreadPool::CountedPtr<T>::operator * () const NOEXCEPT
>+ {
>+   return *ptr;
>+ }
>+ 
>+ template <typename T>
>+-inline T *cbThreadPool::CountedPtr<T>::operator -> () const throw()
>++inline T *cbThreadPool::CountedPtr<T>::operator -> () const NOEXCEPT
>+ {
>+   return ptr;
>+ }
>
>Property changes on: devel/codeblocks/files/patch-src__include__cbthreadpool.h
>___________________________________________________________________
>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
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 203160: 161124