Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ie8025300580981c5349b31d4846a7f659481991d

2 files changed, 3 insertions, 3 deletions

diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp
index 9eb686ed0..81830952a 100644
--- a/sources/shiboken2/libshiboken/basewrapper.cpp
+++ b/sources/shiboken2/libshiboken/basewrapper.cpp
@@ -1502,7 +1502,7 @@ std::string info(SbkObject* self)
         s << String::toCString(parent) << "\n";
     }
 
-    if (self->d->parentInfo && self->d->parentInfo->children.size()) {
+    if (self->d->parentInfo && !self->d->parentInfo->children.empty()) {
         s << "children.......... ";
         for (SbkObject *sbkChild : self->d->parentInfo->children) {
             Shiboken::AutoDecRef child(PyObject_Str(reinterpret_cast<PyObject *>(sbkChild)));
@@ -1511,7 +1511,7 @@ std::string info(SbkObject* self)
         s << '\n';
     }
 
-    if (self->d->referredObjects && self->d->referredObjects->size()) {
+    if (self->d->referredObjects && !self->d->referredObjects->empty()) {
         Shiboken::RefCountMap& map = *self->d->referredObjects;
         s << "referred objects.. ";
         std::string lastKey;
diff --git a/sources/shiboken2/libshiboken/bindingmanager.cpp b/sources/shiboken2/libshiboken/bindingmanager.cpp
index 4053b87f9..82c5bd65f 100644
--- a/sources/shiboken2/libshiboken/bindingmanager.cpp
+++ b/sources/shiboken2/libshiboken/bindingmanager.cpp
@@ -191,7 +191,7 @@ BindingManager::~BindingManager()
         while (!m_d->wrapperMapper.empty()) {
             Object::destroy(m_d->wrapperMapper.begin()->second, const_cast<void*>(m_d->wrapperMapper.begin()->first));
         }
-        assert(m_d->wrapperMapper.size() == 0);
+        assert(m_d->wrapperMapper.empty());
     }
     delete m_d;
 }