aboutsummaryrefslogtreecommitdiffstats
path: root/libshiboken
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2011-09-21 11:25:48 -0300
committerHugo Parente Lima <hugo.pl@gmail.com>2012-03-08 16:17:15 -0300
commit23162dccb763c81f762ea5e0ec60b3931fe5b5f1 (patch)
tree94d5f49aaf8309350825c977e53bc123a5157640 /libshiboken
parent2d8f8d8ac79bc6f266564afd7d0ffe702a7cdf58 (diff)
Fix converter of std::map.
Diffstat (limited to 'libshiboken')
-rw-r--r--libshiboken/conversions.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index fa42622fa..03d914a33 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.h
@@ -612,7 +612,7 @@ struct StdMapConverter
while (PyDict_Next(pyObj, &pos, &key, &value)) {
if (!Converter<typename StdMap::key_type>::isConvertible(key)
- && !Converter<typename StdMap::mapped_type>::isConvertible(value)) {
+ || !Converter<typename StdMap::mapped_type>::isConvertible(value)) {
return false;
}
}