From cb267ef3ad534c125550b0ef5a0c080a404ca037 Mon Sep 17 00:00:00 2001 From: Shukui Chen Date: Sun, 27 Aug 2023 16:51:59 -0400 Subject: [PATCH 1/2] Fix redifinition error --- matplotlibcpp.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/matplotlibcpp.h b/matplotlibcpp.h index d95d46ad..705ad201 100644 --- a/matplotlibcpp.h +++ b/matplotlibcpp.h @@ -350,10 +350,10 @@ template <> struct select_npy_type { const static NPY_TYPES type = NPY // Sanity checks; comment them out or change the numpy type below if you're compiling on // a platform where they don't apply -static_assert(sizeof(long long) == 8); -template <> struct select_npy_type { const static NPY_TYPES type = NPY_INT64; }; -static_assert(sizeof(unsigned long long) == 8); -template <> struct select_npy_type { const static NPY_TYPES type = NPY_UINT64; }; +// static_assert(sizeof(long long) == 8); +// template <> struct select_npy_type { const static NPY_TYPES type = NPY_INT64; }; +// static_assert(sizeof(unsigned long long) == 8); +// template <> struct select_npy_type { const static NPY_TYPES type = NPY_UINT64; }; template PyObject* get_array(const std::vector& v) From f1cf7a199d40c447b55b7b574bb1d9993b70606d Mon Sep 17 00:00:00 2001 From: Shukui Chen Date: Sun, 27 Aug 2023 16:52:33 -0400 Subject: [PATCH 2/2] Update CMakeLists.txt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb2decd8..e4ef8472 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ add_library(matplotlib_cpp INTERFACE) target_include_directories(matplotlib_cpp INTERFACE $ + $ $ ) target_compile_features(matplotlib_cpp INTERFACE