diff options
| author | bubnikv <bubnikv@gmail.com> | 2018-09-14 16:03:38 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2018-09-14 16:03:38 +0300 |
| commit | 7fc0b4375c43ebb8dcb8e198cc1babdd78da866e (patch) | |
| tree | 5fd9da1f0b308ce5440d7a432d169d99bf7a8273 /xs/src/libnest2d/tools/libnfpglue.hpp | |
| parent | a0e2df5dbb26079e5220fdc6fce02f5200c1421e (diff) | |
| parent | 1acee8900695b7060f2ee136b4da8e3778b407cb (diff) | |
Merge remote-tracking branch 'origin/parallel_arrange'
Diffstat (limited to 'xs/src/libnest2d/tools/libnfpglue.hpp')
| -rw-r--r-- | xs/src/libnest2d/tools/libnfpglue.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xs/src/libnest2d/tools/libnfpglue.hpp b/xs/src/libnest2d/tools/libnfpglue.hpp index 75f639445..1ff033cb9 100644 --- a/xs/src/libnest2d/tools/libnfpglue.hpp +++ b/xs/src/libnest2d/tools/libnfpglue.hpp @@ -5,22 +5,22 @@ namespace libnest2d { -using NfpR = Nfp::NfpResult<PolygonImpl>; +using NfpR = nfp::NfpResult<PolygonImpl>; NfpR _nfp(const PolygonImpl& sh, const PolygonImpl& cother); template<> -struct Nfp::NfpImpl<PolygonImpl, NfpLevel::CONVEX_ONLY> { +struct nfp::NfpImpl<PolygonImpl, nfp::NfpLevel::CONVEX_ONLY> { NfpR operator()(const PolygonImpl& sh, const PolygonImpl& cother); }; template<> -struct Nfp::NfpImpl<PolygonImpl, NfpLevel::ONE_CONVEX> { +struct nfp::NfpImpl<PolygonImpl, nfp::NfpLevel::ONE_CONVEX> { NfpR operator()(const PolygonImpl& sh, const PolygonImpl& cother); }; template<> -struct Nfp::NfpImpl<PolygonImpl, NfpLevel::BOTH_CONCAVE> { +struct nfp::NfpImpl<PolygonImpl, nfp::NfpLevel::BOTH_CONCAVE> { NfpR operator()(const PolygonImpl& sh, const PolygonImpl& cother); }; @@ -34,7 +34,7 @@ struct Nfp::NfpImpl<PolygonImpl, NfpLevel::BOTH_CONCAVE> { // NfpResult operator()(const PolygonImpl& sh, const PolygonImpl& cother); //}; -template<> struct Nfp::MaxNfpLevel<PolygonImpl> { +template<> struct nfp::MaxNfpLevel<PolygonImpl> { static const BP2D_CONSTEXPR NfpLevel value = // NfpLevel::CONVEX_ONLY; NfpLevel::BOTH_CONCAVE; |