Skip to content
Snippets Groups Projects
Commit 0ea39161 authored by Katharina Heck's avatar Katharina Heck
Browse files

Merge branch 'fix/clang-error' into 'master'

[3pimmiscible] Remove DUNE_THROW from constexpr function

Closes #774

See merge request !1731
parents 112a19cf 15292120
No related branches found
No related tags found
1 merge request!1731[3pimmiscible] Remove DUNE_THROW from constexpr function
...@@ -121,7 +121,7 @@ public: ...@@ -121,7 +121,7 @@ public:
case wPhaseIdx: return WettingFluid::isGas(); break; case wPhaseIdx: return WettingFluid::isGas(); break;
case nPhaseIdx: return NonwettingFluid::isGas(); break; case nPhaseIdx: return NonwettingFluid::isGas(); break;
case gPhaseIdx: return Gas::isGas(); break; case gPhaseIdx: return Gas::isGas(); break;
default: DUNE_THROW(Dune::InvalidStateException, "Invalid phase index"); default: return false; // TODO: constexpr-compatible throw
} }
} }
...@@ -160,7 +160,7 @@ public: ...@@ -160,7 +160,7 @@ public:
case wPhaseIdx: return WettingFluid::isCompressible(); break; case wPhaseIdx: return WettingFluid::isCompressible(); break;
case nPhaseIdx: return NonwettingFluid::isCompressible(); break; case nPhaseIdx: return NonwettingFluid::isCompressible(); break;
case gPhaseIdx: return Gas::isCompressible(); break; case gPhaseIdx: return Gas::isCompressible(); break;
default: DUNE_THROW(Dune::InvalidStateException, "Invalid phase index"); default: return false; // TODO: constexpr-compatible throw
} }
} }
...@@ -180,7 +180,7 @@ public: ...@@ -180,7 +180,7 @@ public:
case wPhaseIdx: return WettingFluid::isIdealGas(); break; case wPhaseIdx: return WettingFluid::isIdealGas(); break;
case nPhaseIdx: return NonwettingFluid::isIdealGas(); break; case nPhaseIdx: return NonwettingFluid::isIdealGas(); break;
case gPhaseIdx: return Gas::isIdealGas(); break; case gPhaseIdx: return Gas::isIdealGas(); break;
default: DUNE_THROW(Dune::InvalidStateException, "Invalid phase index"); default: return false; // TODO: constexpr-compatible throw
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment