From 575e863e4ac8367f1299e46a4c3e3c99ef702425 Mon Sep 17 00:00:00 2001 From: Christopher Lackner Date: Tue, 6 Aug 2019 15:58:15 +0200 Subject: [PATCH] fix ambiguous namespace --- libsrc/core/python_ngcore.hpp | 2 +- libsrc/general/ngpython.hpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libsrc/core/python_ngcore.hpp b/libsrc/core/python_ngcore.hpp index 9c283589..562467cc 100644 --- a/libsrc/core/python_ngcore.hpp +++ b/libsrc/core/python_ngcore.hpp @@ -7,10 +7,10 @@ #include "archive.hpp" #include "flags.hpp" #include "ngcore_api.hpp" +namespace py = pybind11; namespace ngcore { - namespace py = pybind11; template Array makeCArray(const py::object& obj) diff --git a/libsrc/general/ngpython.hpp b/libsrc/general/ngpython.hpp index 722709c5..e13533c1 100644 --- a/libsrc/general/ngpython.hpp +++ b/libsrc/general/ngpython.hpp @@ -4,10 +4,11 @@ #include #include #include -namespace py = pybind11; #include #include +#include +using namespace ngcore; template py::array MoveToNumpy(std::vector& vec)