summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2020-10-03 02:06:12 +0200
committer couriersud <couriersud@gmx.org>2020-10-03 02:06:25 +0200
commit467b8f7d0920ee8f9f83086bc7323feed8fe76ea (patch)
treebf290b6390ede5b3a60a8e8ba449dbf12183a357
parent0f9926f02c1a847603d6e3c8f86655fafedfc13d (diff)
netlist: Revert changes intended to make the code work on OSX 10.10.
* This is working on all contemporary compilers. If outdated compilers are to be used it is fine but a suitable compile path should be used.
-rwxr-xr-xsrc/lib/netlist/plib/pmatrix2d.h4
-rw-r--r--src/lib/netlist/plib/pmatrix_cr.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/netlist/plib/pmatrix2d.h b/src/lib/netlist/plib/pmatrix2d.h
index d0ce462ebfa..02efb60cf6c 100755
--- a/src/lib/netlist/plib/pmatrix2d.h
+++ b/src/lib/netlist/plib/pmatrix2d.h
@@ -53,8 +53,8 @@ namespace plib
pmatrix2d(const pmatrix2d &) = delete;
pmatrix2d &operator=(const pmatrix2d &) = delete;
- pmatrix2d(pmatrix2d &&) = delete;
- pmatrix2d &operator=(pmatrix2d &&) = delete;
+ pmatrix2d(pmatrix2d &&) noexcept = delete;
+ pmatrix2d &operator=(pmatrix2d &&) noexcept = delete;
~pmatrix2d()
{
diff --git a/src/lib/netlist/plib/pmatrix_cr.h b/src/lib/netlist/plib/pmatrix_cr.h
index 054847fa492..66d665f3966 100644
--- a/src/lib/netlist/plib/pmatrix_cr.h
+++ b/src/lib/netlist/plib/pmatrix_cr.h
@@ -37,8 +37,8 @@ namespace plib
pmatrix_cr(const pmatrix_cr &) = default;
pmatrix_cr &operator=(const pmatrix_cr &) = default;
- pmatrix_cr(pmatrix_cr &&) = default;
- pmatrix_cr &operator=(pmatrix_cr &&) = default;
+ pmatrix_cr(pmatrix_cr &&) noexcept(std::is_nothrow_move_constructible<parray<value_type, NSQ>>::value) = default;
+ pmatrix_cr &operator=(pmatrix_cr &&) noexcept(std::is_nothrow_move_assignable<parray<value_type, NSQ>>::value) = default;
enum constants_e
{