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

Merge branch 'master' of https://github.com/wjakob/pybind11

Browse Source
This commit is contained in:
Wenzel Jakob 2015-08-24 15:32:50 +02:00
commit 43dbdfd0e7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pybind/pybind.h
View File

@ -103,7 +103,7 @@ private:
PyObject *pyArgs, PyObject *kwargs, bool is_method, detail::index_sequence<Index...>) { PyObject *pyArgs, PyObject *kwargs, bool is_method, detail::index_sequence<Index...>) {
int index = is_method ? 1 : 0; int index = is_method ? 1 : 0;
int unused[] = { 0, (process_extra(std::get<Index>(args), index, pyArgs, kwargs), 0)... }; int unused[] = { 0, (process_extra(std::get<Index>(args), index, pyArgs, kwargs), 0)... };
(void) unused; (void) unused; (void) index;
} }
static void process_extra(const char *doc, function_entry *entry, const char **, const char **) { entry->doc = doc; } static void process_extra(const char *doc, function_entry *entry, const char **, const char **) { entry->doc = doc; }

5
tools/mkdoc.py
View File

@ -203,8 +203,9 @@ if __name__ == '__main__':
Do not edit! These were automatically extracted by mkdoc.py Do not edit! These were automatically extracted by mkdoc.py
*/ */
#define __EXPAND(x) x
#define __COUNT(_1, _2, _3, _4, _5, COUNT, ...) COUNT #define __COUNT(_1, _2, _3, _4, _5, COUNT, ...) COUNT
#define __VA_SIZE(...) __COUNT(__VA_ARGS__, 5, 4, 3, 2, 1) #define __VA_SIZE(...) __EXPAND(__COUNT(__VA_ARGS__, 5, 4, 3, 2, 1))
#define __CAT1(a, b) a ## b #define __CAT1(a, b) a ## b
#define __CAT2(a, b) __CAT1(a, b) #define __CAT2(a, b) __CAT1(a, b)
#define __DOC1(n1) __doc_##n1 #define __DOC1(n1) __doc_##n1
@ -212,7 +213,7 @@ if __name__ == '__main__':
#define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3 #define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3
#define __DOC4(n1, n2, n3, n4) __doc_##n1##_##n2##_##n3##_##n4 #define __DOC4(n1, n2, n3, n4) __doc_##n1##_##n2##_##n3##_##n4
#define __DOC5(n1, n2, n3, n4, n5) __doc_##n1##_##n2##_##n3##_##n4_##n5 #define __DOC5(n1, n2, n3, n4, n5) __doc_##n1##_##n2##_##n3##_##n4_##n5
#define DOC(...) __CAT2(__DOC, __VA_SIZE(__VA_ARGS__))(__VA_ARGS__) #define DOC(...) __EXPAND(__EXPAND(__CAT2(__DOC, __VA_SIZE(__VA_ARGS__)))(__VA_ARGS__))
#if defined(__GNUG__) #if defined(__GNUG__)
#pragma GCC diagnostic push #pragma GCC diagnostic push