Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-26 23:22:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace 4096B format buffer with std::string

Browse Source
This commit is contained in:
Ivan Smirnov 2016-07-18 22:52:08 +01:00
parent f5f75c6544
commit 098f9aef73
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/pybind11/numpy.h
View File

@ -291,7 +291,7 @@ struct npy_format_descriptor<T, typename std::enable_if<is_pod_struct<T>::value>
static const char* format() { static const char* format() {
if (!dtype_()) if (!dtype_())
pybind11_fail("NumPy: unsupported buffer format!"); pybind11_fail("NumPy: unsupported buffer format!");
return format_(); return format_().c_str();
} }
static void register_dtype(std::initializer_list<field_descriptor> fields) { static void register_dtype(std::initializer_list<field_descriptor> fields) {
@ -337,7 +337,7 @@ struct npy_format_descriptor<T, typename std::enable_if<is_pod_struct<T>::value>
if (sizeof(T) > offset) if (sizeof(T) > offset)
oss << (sizeof(T) - offset) << 'x'; oss << (sizeof(T) - offset) << 'x';
oss << '}'; oss << '}';
std::strncpy(format_(), oss.str().c_str(), 4096); format_() = oss.str();
// Sanity check: verify that NumPy properly parses our buffer format string // Sanity check: verify that NumPy properly parses our buffer format string
auto arr = array(buffer_info(nullptr, sizeof(T), format(), 1, { 0 }, { sizeof(T) })); auto arr = array(buffer_info(nullptr, sizeof(T), format(), 1, { 0 }, { sizeof(T) }));
@ -348,7 +348,7 @@ struct npy_format_descriptor<T, typename std::enable_if<is_pod_struct<T>::value>
private: private:
static inline PyObject*& dtype_() { static PyObject *ptr = nullptr; return ptr; } static inline PyObject*& dtype_() { static PyObject *ptr = nullptr; return ptr; }
static inline char* format_() { static char s[4096]; return s; } static inline std::string& format_() { static std::string s; return s; }
}; };
// Extract name, offset and format descriptor for a struct field // Extract name, offset and format descriptor for a struct field