aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/pyext/scoped_pyobject_ptr.h
diff options
context:
space:
mode:
authorGravatar Josh Haberman <jhaberman@gmail.com>2015-10-06 14:13:09 -0700
committerGravatar Josh Haberman <jhaberman@gmail.com>2015-10-28 17:05:47 -0700
commit00700b72191d620402d5eb0390b5460b35c93e05 (patch)
treedbf199b487dadb402ae52c401ab95c81f437a9ef /python/google/protobuf/pyext/scoped_pyobject_ptr.h
parent12fb61b292d7ec4cb14b0d60e58ed5c35adda3b7 (diff)
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/scoped_pyobject_ptr.h')
-rw-r--r--python/google/protobuf/pyext/scoped_pyobject_ptr.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/python/google/protobuf/pyext/scoped_pyobject_ptr.h b/python/google/protobuf/pyext/scoped_pyobject_ptr.h
index 9979b83b..a128cd4c 100644
--- a/python/google/protobuf/pyext/scoped_pyobject_ptr.h
+++ b/python/google/protobuf/pyext/scoped_pyobject_ptr.h
@@ -60,11 +60,6 @@ class ScopedPyObjectPtr {
return ptr_;
}
- // ScopedPyObjectPtr should not be copied.
- // We explicitly list and delete this overload to avoid automatic conversion
- // to PyObject*, which is wrong in this case.
- PyObject* reset(const ScopedPyObjectPtr& other) = delete;
-
// Releases ownership of the object.
// The caller now owns the returned reference.
PyObject* release() {
@@ -73,8 +68,6 @@ class ScopedPyObjectPtr {
return p;
}
- operator PyObject*() { return ptr_; }
-
PyObject* operator->() const {
assert(ptr_ != NULL);
return ptr_;