Skip to content

Commit

Permalink
have_sys_time
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasaunai committed Nov 28, 2023
1 parent c3a1b10 commit b24c4d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions src/initializer/python_data_provider.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// this file includes python which has conflicting #defines with SAMRAI
// so include it last

Expand All @@ -13,7 +12,7 @@
DISABLE_WARNING(shadow, shadow-field-in-constructor-modified, 42)

#undef HAVE_SYS_TIMES_H // included in python again, possibly with different value
#undef HAVE_UNISTD_HPP
#undef HAVE_UNISTD_H

#include <pybind11/embed.h> // everything needed for embedding
#include <pybind11/functional.h>
Expand Down
2 changes: 1 addition & 1 deletion src/python3/cpp_simulator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
#include "phare/phare.hpp"
#include "simulator/simulator.hpp"

#include "python3/pybind_def.hpp"
#include "pybind11/stl.h"
#include "pybind11/numpy.h"
#include "pybind11/chrono.h"
#include "pybind11/complex.h"
#include "pybind11/functional.h"

#include "python3/pybind_def.hpp"
#include "python3/particles.hpp"
#include "python3/patch_data.hpp"
#include "python3/patch_level.hpp"
Expand Down
2 changes: 2 additions & 0 deletions src/python3/pybind_def.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#include "pybind11/stl.h"
#include "pybind11/numpy.h"
#undef HAVE_SYS_TIMES_H // included in python again, possibly with different value
#undef HAVE_UNISTD_H

namespace PHARE::pydata
{
Expand Down

0 comments on commit b24c4d8

Please sign in to comment.