gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-31 23:08:09 -07:00
Code Issues Projects Releases Wiki Activity

dev-cpp/libcult: fix cpp14 compilation; bug 593928

Browse Source 
* remove throw specificator in operator new declaration when compilation
   is performed using standard >= C++11
 * add cast from normal iterator to const iterator in one place

Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=593928
Closes: https://github.com/gentoo/gentoo/pull/2357

Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
Kacper Kołodziej
2016-09-18 17:50:39 +02:00
committed by David Seifert
parent 50e8e2a3ac
commit 00d100aaf6
2 changed files with 164 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
dev-cpp/libcult/files/libcult-1.4.6-cpp14.patch Normal file
View File

@@ -0,0 +1,163 @@
Fix compilation with GCC 6.x (C++14 as default standard). Remove throw
specificator from function declaration when compilation is performed with
standard >= C++11. Adds one cast to argument in C++11, C++14.
Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=593928
--- a/cult/cli/file-arguments.hxx
+++ b/cult/cli/file-arguments.hxx
@@ -46,8 +46,12 @@
{
if (i >= size ())
throw Bounds ();
-
- args_.erase (args_.begin () + i);
+
+#if __cplusplus < 201103L
+ args_.erase (args_.begin() + i);
+#else
+ args_.erase ((Containers::Vector<String>::ConstIterator)(args_.begin () + i));
+#endif
}
private:
--- a/cult/mm/new.cxx
+++ b/cult/mm/new.cxx
@@ -140,7 +140,12 @@
using namespace Cult;
Void*
-operator new (Size s) throw (MM::StdBadAlloc)
+operator new (Size s)
+#if __cplusplus < 201103L
+throw (MM::StdBadAlloc)
+#else
+noexcept(false)
+#endif
{
return MM::allocate (s, *MM::counted);
}
--- a/cult/mm/new.hxx
+++ b/cult/mm/new.hxx
@@ -255,7 +255,13 @@
}
Cult::Void*
-operator new (Cult::Size) throw (Cult::MM::StdBadAlloc);
+operator new (Cult::Size)
+#if __cplusplus < 201103L
+throw (Cult::MM::StdBadAlloc)
+#else
+noexcept(false)
+#endif
+;
Cult::Void*
operator new (Cult::Size,
--- a/cult/sched/condition.cxx
+++ b/cult/sched/condition.cxx
@@ -12,6 +12,9 @@
{
Condition::
~Condition ()
+#if __cplusplus >= 201103L
+ noexcept(false)
+#endif
{
if (Int e = pthread_cond_destroy (&cond_))
throw Implementation (e);
--- a/cult/sched/condition.hxx
+++ b/cult/sched/condition.hxx
@@ -19,7 +19,11 @@
class Condition: public NonCopyable
{
public:
- ~Condition ();
+ ~Condition ()
+#if __cplusplus >= 201103L
+ noexcept(false)
+#endif
+ ;
Condition (Mutex& mutex);
--- a/cult/sched/mutex.cxx
+++ b/cult/sched/mutex.cxx
@@ -12,6 +12,9 @@
{
Mutex::
~Mutex ()
+#if __cplusplus >= 201103L
+ noexcept(false)
+#endif
{
if (Int e = pthread_mutex_destroy (&mutex_))
throw Implementation (e);
--- a/cult/sched/mutex.hxx
+++ b/cult/sched/mutex.hxx
@@ -17,7 +17,11 @@
class Mutex: public NonCopyable
{
public:
- ~Mutex ();
+ ~Mutex ()
+#if __cplusplus >= 201103L
+ noexcept(false)
+#endif
+ ;
Mutex ();
--- a/cult/sched/spin.cxx
+++ b/cult/sched/spin.cxx
@@ -12,6 +12,9 @@
{
Spin::
~Spin ()
+#if __cplusplus >= 201103L
+ noexcept(false)
+#endif
{
if (Int e = pthread_spin_destroy (&spin_))
throw Implementation (e);
--- a/cult/sched/spin.hxx
+++ b/cult/sched/spin.hxx
@@ -17,7 +17,11 @@
class Spin: public NonCopyable
{
public:
- ~Spin ();
+ ~Spin ()
+#if __cplusplus >= 201103L
+ noexcept(false)
+#endif
+ ;
Spin ();
--- a/cult/sched/thread.cxx
+++ b/cult/sched/thread.cxx
@@ -196,6 +196,9 @@
Thread::
~Thread ()
+#if __cplusplus >= 201103L
+ noexcept(false)
+#endif
{
tout << "thread is being destroyed.";
--- a/cult/sched/thread.hxx
+++ b/cult/sched/thread.hxx
@@ -30,7 +30,11 @@
public:
virtual
- ~Thread ();
+ ~Thread ()
+#if __cplusplus >= 201103L
+ noexcept(false)
+#endif
+ ;
Thread (Void* (*StartRoutine) (Void*), Void* arg = 0);

1
dev-cpp/libcult/libcult-1.4.6-r1.ebuild
View File

@@ -26,6 +26,7 @@ src_prepare() {
makefile || die "sed failed"
epatch "${FILESDIR}/${PV}-fix-compilation-with-gcc-4.7.patch"
epatch "${FILESDIR}/${P}-cpp14.patch" # bug #593928
}
src_configure() {