ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix ambiguous namespace

Browse Source
This commit is contained in:
Christopher Lackner 2019-08-06 15:58:15 +02:00
parent 262f1ea12c
commit 575e863e4a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/core/python_ngcore.hpp
View File

@ -7,10 +7,10 @@
#include "archive.hpp" #include "archive.hpp"
#include "flags.hpp" #include "flags.hpp"
#include "ngcore_api.hpp" #include "ngcore_api.hpp"
namespace py = pybind11;
namespace ngcore namespace ngcore
{ {
namespace py = pybind11;
template<typename T> template<typename T>
Array<T> makeCArray(const py::object& obj) Array<T> makeCArray(const py::object& obj)

3
libsrc/general/ngpython.hpp
View File

@ -4,10 +4,11 @@
#include <pybind11/operators.h> #include <pybind11/operators.h>
#include <pybind11/numpy.h> #include <pybind11/numpy.h>
#include <pybind11/stl.h> #include <pybind11/stl.h>
namespace py = pybind11;
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <core/python_ngcore.hpp>
using namespace ngcore;
template <typename T> template <typename T>
py::array MoveToNumpy(std::vector<T>& vec) py::array MoveToNumpy(std::vector<T>& vec)