Attachment #161124 for bug #203160

View | Details | Raw Unified | Return to bug 203160
Collapse All | Expand All

Lines 38-43 Link Here

(-)devel/codeblocks/Makefile (+3 lines)
38		38
39	.if ${CHOSEN_COMPILER_TYPE} == clang	39	.if ${CHOSEN_COMPILER_TYPE} == clang
40	USE_CXXSTD= c++11	40	USE_CXXSTD= c++11
		41	. if ${COMPILER_VERSION} >= 35
		42	CXXFLAGS+= -Wno-undefined-bool-conversion
		43	. endif
41	.endif	44	.endif
42		45
43	.include <bsd.port.post.mk>	46	.include <bsd.port.post.mk>




--- 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;
 }

Return to bug 203160

Line 0 Link Here

(-)devel/codeblocks/files/patch-src__include__cbthreadpool.h (+73 lines)
		1	--- src/include/cbthreadpool.h.orig 2013-11-17 20:34:15.000000000 +0100
		2	+++ src/include/cbthreadpool.h 2015-09-16 21:19:53.385265000 +0200
		3	@@ -15,6 +15,12 @@
		4	#include "settings.h"
		5	#include "prep.h"
		6
		7	+#if defined(__has_feature) && __has_feature(cxx_noexcept)
		8	+#define NOEXCEPT noexcept
		9	+#else
		10	+#define NOEXCEPT throw()
		11	+#endif
		12	+
		13	/// A Thread Pool implementation
		14	class DLLIMPORT cbThreadPool
		15	{
		16	@@ -94,11 +100,11 @@ class DLLIMPORT cbThreadPool
		17
		18	public:
		19	explicit CountedPtr(T *p = 0);
		20	- CountedPtr(const CountedPtr<T> &p) throw();
		21	- ~CountedPtr() throw();
		22	- CountedPtr<T> &operator = (const CountedPtr<T> &p) throw();
		23	- T &operator * () const throw();
		24	- T *operator -> () const throw();
		25	+ CountedPtr(const CountedPtr<T> &p) NOEXCEPT;
		26	+ ~CountedPtr() NOEXCEPT;
		27	+ CountedPtr<T> &operator = (const CountedPtr<T> &p) NOEXCEPT;
		28	+ T &operator * () const NOEXCEPT;
		29	+ T *operator -> () const NOEXCEPT;
		30
		31	private:
		32	void dispose();
		33	@@ -281,7 +287,7 @@ inline cbThreadPool::CountedPtr<T>::Coun
		34	}
		35
		36	template <typename T>
		37	-inline cbThreadPool::CountedPtr<T>::CountedPtr(const CountedPtr<T> &p) throw()
		38	+inline cbThreadPool::CountedPtr<T>::CountedPtr(const CountedPtr<T> &p) NOEXCEPT
		39	: ptr(p.ptr),
		40	count(p.count)
		41	{
		42	@@ -289,13 +295,13 @@ inline cbThreadPool::CountedPtr<T>::Coun
		43	}
		44
		45	template <typename T>
		46	-inline cbThreadPool::CountedPtr<T>::~CountedPtr() throw()
		47	+inline cbThreadPool::CountedPtr<T>::~CountedPtr() NOEXCEPT
		48	{
		49	dispose();
		50	}
		51
		52	template <typename T>
		53	-inline cbThreadPool::CountedPtr<T> &cbThreadPool::CountedPtr<T>::operator = (const CountedPtr<T> &p) throw()
		54	+inline cbThreadPool::CountedPtr<T> &cbThreadPool::CountedPtr<T>::operator = (const CountedPtr<T> &p) NOEXCEPT
		55	{
		56	if (this != &p)
		57	{
		58	@@ -309,13 +315,13 @@ inline cbThreadPool::CountedPtr<T> &cbTh
		59	}
		60
		61	template <typename T>
		62	-inline T &cbThreadPool::CountedPtr<T>::operator * () const throw()
		63	+inline T &cbThreadPool::CountedPtr<T>::operator * () const NOEXCEPT
		64	{
65	return *ptr;
66	}
67
68	template <typename T>
69	-inline T *cbThreadPool::CountedPtr<T>::operator -> () const throw()
70	+inline T *cbThreadPool::CountedPtr<T>::operator -> () const NOEXCEPT
71	{
72	return ptr;
73	}