svn commit: r404241 - in head/devel/codeblocks: . files

[Martin Wilke]

Author: miwi
Date: Tue Dec 22 15:22:48 2015
New Revision: 404241
URL: https://svnweb.freebsd.org/changeset/ports/404241

Log:
  - Fix build with clang 3.7.0
  
  PR:		203160
  Submitted by:	dim
  Approved by:	mat (mentor)
  Differential Revision:	D4653

Added:
  head/devel/codeblocks/files/
  head/devel/codeblocks/files/patch-src__include__cbthreadpool.h   (contents, props changed)
Modified:
  head/devel/codeblocks/Makefile

Modified: head/devel/codeblocks/Makefile
==============================================================================
--- head/devel/codeblocks/Makefile	Tue Dec 22 15:17:46 2015	(r404240)
+++ head/devel/codeblocks/Makefile	Tue Dec 22 15:22:48 2015	(r404241)
@@ -38,6 +38,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 .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>

Added: head/devel/codeblocks/files/patch-src__include__cbthreadpool.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/codeblocks/files/patch-src__include__cbthreadpool.h	Tue Dec 22 15:22:48 2015	(r404241)
@@ -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;
+ }