diff options
author | Josh Haberman <jhaberman@gmail.com> | 2015-10-06 14:13:09 -0700 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2015-10-28 17:05:47 -0700 |
commit | 00700b72191d620402d5eb0390b5460b35c93e05 (patch) | |
tree | dbf199b487dadb402ae52c401ab95c81f437a9ef /python/google/protobuf/pyext/descriptor_containers.cc | |
parent | 12fb61b292d7ec4cb14b0d60e58ed5c35adda3b7 (diff) | |
download | protobuf-00700b72191d620402d5eb0390b5460b35c93e05.tar.gz protobuf-00700b72191d620402d5eb0390b5460b35c93e05.tar.bz2 protobuf-00700b72191d620402d5eb0390b5460b35c93e05.zip |
Removed all warnings from the Python/C++ build.
Also made the Travis build ensure that no warnings
are present.
These builds were previously spewing many warnings,
which was hiding warnings for important things like
accidentally using C++11-only features.
Change-Id: I56caeee9db48bc78756a3e8d7c14874630627037
Diffstat (limited to 'python/google/protobuf/pyext/descriptor_containers.cc')
-rw-r--r-- | python/google/protobuf/pyext/descriptor_containers.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/google/protobuf/pyext/descriptor_containers.cc b/python/google/protobuf/pyext/descriptor_containers.cc index b20f5e4f..e505d812 100644 --- a/python/google/protobuf/pyext/descriptor_containers.cc +++ b/python/google/protobuf/pyext/descriptor_containers.cc @@ -355,7 +355,7 @@ static int DescriptorSequence_Equal(PyContainer* self, PyObject* other) { if (value2 == NULL) { return -1; } - int cmp = PyObject_RichCompareBool(value1, value2, Py_EQ); + int cmp = PyObject_RichCompareBool(value1.get(), value2, Py_EQ); if (cmp != 1) // error or not equal return cmp; } @@ -399,12 +399,12 @@ static int DescriptorMapping_Equal(PyContainer* self, PyObject* other) { if (value1 == NULL) { return -1; } - PyObject* value2 = PyDict_GetItem(other, key); + PyObject* value2 = PyDict_GetItem(other, key.get()); if (value2 == NULL) { // Not found in the other dictionary return 0; } - int cmp = PyObject_RichCompareBool(value1, value2, Py_EQ); + int cmp = PyObject_RichCompareBool(value1.get(), value2, Py_EQ); if (cmp != 1) // error or not equal return cmp; } |