From 849fdc5bb64af8b075fe6d055c56207cdc40de91 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 6 Sep 2018 11:03:46 +0200 Subject: [PATCH] Python: Container Namespace Ambiguity Fix access to local `detail` namespace. --- CHANGELOG.rst | 1 + src/binding/python/Container.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9fb025a256..97d01e93e3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -27,6 +27,7 @@ Bug Fixes - single precision support: ``numpy.float`` is an alias for ``builtins.float`` #318 #320 - ``Dataset`` method namings to underscores #319 + - container namespace ambiguity #343 Other """"" diff --git a/src/binding/python/Container.cpp b/src/binding/python/Container.cpp index b483d06a6b..18d49d9883 100644 --- a/src/binding/python/Container.cpp +++ b/src/binding/python/Container.cpp @@ -215,31 +215,31 @@ PYBIND11_MAKE_OPAQUE(PyMeshRecordComponentContainer) PYBIND11_MAKE_OPAQUE(PyBaseRecordComponentContainer) void init_Container( py::module & m ) { - detail::bind_container< PyIterationContainer >( + ::detail::bind_container< PyIterationContainer >( m, "Iteration_Container" ); - detail::bind_container< PyMeshContainer >( + ::detail::bind_container< PyMeshContainer >( m, "Mesh_Container" ); - detail::bind_container< PyPartContainer >( + ::detail::bind_container< PyPartContainer >( m, "Particle_Container" ); - detail::bind_container< PyRecordContainer >( + ::detail::bind_container< PyRecordContainer >( m, "Record_Container" ); - detail::bind_container< PyRecordComponentContainer >( + ::detail::bind_container< PyRecordComponentContainer >( m, "Record_Component_Container" ); - detail::bind_container< PyMeshRecordComponentContainer >( + ::detail::bind_container< PyMeshRecordComponentContainer >( m, "Mesh_Record_Component_Container" ); - detail::bind_container< PyBaseRecordComponentContainer >( + ::detail::bind_container< PyBaseRecordComponentContainer >( m, "Base_Record_Component_Container" );