Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
efd9e987
Commit
efd9e987
authored
Aug 04, 2015
by
Wenzel Jakob
Browse files
windows fixes
parent
281aa0e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
include/pybind/pybind.h
include/pybind/pybind.h
+1
-1
tools/mkdoc.py
tools/mkdoc.py
+3
-2
No files found.
include/pybind/pybind.h
View file @
efd9e987
...
...
@@ -103,7 +103,7 @@ private:
PyObject
*
pyArgs
,
PyObject
*
kwargs
,
bool
is_method
,
detail
::
index_sequence
<
Index
...
>
)
{
int
index
=
is_method
?
1
:
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
;
}
...
...
tools/mkdoc.py
View file @
efd9e987
...
...
@@ -203,8 +203,9 @@ if __name__ == '__main__':
Do not edit! These were automatically extracted by mkdoc.py
*/
#define __EXPAND(x) x
#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 __CAT2(a, b) __CAT1(a, b)
#define __DOC1(n1) __doc_##n1
...
...
@@ -212,7 +213,7 @@ if __name__ == '__main__':
#define __DOC3(n1, n2, n3) __doc_##n1##_##n2##_##n3
#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 DOC(...) __CAT2(__DOC, __VA_SIZE(__VA_ARGS__))(__VA_ARGS__)
#define DOC(...)
__EXPAND(__EXPAND(
__CAT2(__DOC, __VA_SIZE(__VA_ARGS__))
)
(__VA_ARGS__)
)
#if defined(__GNUG__)
#pragma GCC diagnostic push
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment