From 8337e1410fabeb6ba2f033958a063f8ff95db99a Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Fri, 29 May 2020 13:26:55 +0200
Subject: [PATCH] [MeshLib] Resolved the namespace conflict with VTK
---
MeshLib/Elements/TemplateElement-impl.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/MeshLib/Elements/TemplateElement-impl.h b/MeshLib/Elements/TemplateElement-impl.h
index bd185646fc7..0e87b63befc 100644
--- a/MeshLib/Elements/TemplateElement-impl.h
+++ b/MeshLib/Elements/TemplateElement-impl.h
@@ -51,8 +51,7 @@ TemplateElement<ELEMENT_RULE>::TemplateElement(const TemplateElement &e)
this->_content = e.getContent();
}
-
-namespace detail
+namespace details
{
template<unsigned N>
@@ -76,15 +75,14 @@ isEdge(unsigned const (&/*edge_nodes*/)[1], unsigned /*idx1*/, unsigned /*idx2*/
return false;
}
-} // namespace detail
-
+} // namespace details
template <class ELEMENT_RULE>
bool TemplateElement<ELEMENT_RULE>::isEdge(unsigned idx1, unsigned idx2) const
{
for (unsigned i(0); i<getNumberOfEdges(); i++)
{
- if (detail::isEdge(ELEMENT_RULE::edge_nodes[i], idx1, idx2))
+ if (details::isEdge(ELEMENT_RULE::edge_nodes[i], idx1, idx2))
{
return true;
}
--
GitLab