diff options
author | Christian Tismer <tismer@stackless.com> | 2018-08-22 14:41:41 +0200 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2018-08-23 07:51:54 +0000 |
commit | b45a890df5bb26c3a4feb8d57dd994fdaaf9c750 (patch) | |
tree | cd425ec17ee5bb3211b4e97c37bf2ac8b91cb075 /sources/pyside2/libpyside | |
parent | 50dca3ef00ffe074959cccb4b2b451cbf0afd384 (diff) |
Limited API: remove the "slot_" workaround
It has been a problem to compile the file "typespec.*" when using
Python 2. For some reason, the name "slot" was not usable.
I cannot find out what it was and how it vanished, but now I could
remove the work-around without problems. Maybe it is due to some
different includes which don't define some macros?
Change-Id: If316c9c78a18cffcc5e4cac07610bd7f522db446
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/libpyside')
-rw-r--r-- | sources/pyside2/libpyside/pysideqflags.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp index 7a8fa2a05..c33758c5e 100644 --- a/sources/pyside2/libpyside/pysideqflags.cpp +++ b/sources/pyside2/libpyside/pysideqflags.cpp @@ -174,13 +174,8 @@ namespace QFlags newspec->itemsize = SbkNewQFlagsType_spec.itemsize; newspec->flags = SbkNewQFlagsType_spec.flags; int idx = -1; -#ifdef IS_PY3K -# define SLOT slot -#else -# define SLOT slot_ -#endif - while (numberMethods[++idx].SLOT) { - assert(SbkNewQFlagsType_slots[idx].SLOT == numberMethods[idx].SLOT); + while (numberMethods[++idx].slot) { + assert(SbkNewQFlagsType_slots[idx].slot == numberMethods[idx].slot); SbkNewQFlagsType_slots[idx].pfunc = numberMethods[idx].pfunc; } newspec->slots = SbkNewQFlagsType_spec.slots; |