diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 11:01:32 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 11:01:32 -0800 |
| commit | 643d09ac7dcbf3b014a8a0465ebc4405ac8388b7 (patch) | |
| tree | 67abff5f87181bf73ae4b7588028647d6126a7d7 /python/google/protobuf/pyext/scoped_pyobject_ptr.h | |
| parent | 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e (diff) | |
| parent | c76807211af6ae86368bcd7651ca707ee7f12f86 (diff) | |
Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo
Conflicts:
src/google/protobuf/compiler/java/java_file.cc
Diffstat (limited to 'python/google/protobuf/pyext/scoped_pyobject_ptr.h')
| -rw-r--r-- | python/google/protobuf/pyext/scoped_pyobject_ptr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/google/protobuf/pyext/scoped_pyobject_ptr.h b/python/google/protobuf/pyext/scoped_pyobject_ptr.h index fefebb6a..18ddd5cd 100644 --- a/python/google/protobuf/pyext/scoped_pyobject_ptr.h +++ b/python/google/protobuf/pyext/scoped_pyobject_ptr.h @@ -40,7 +40,7 @@ namespace google { class ScopedPyObjectPtr { public: - // Constructor. Defaults to intializing with NULL. + // Constructor. Defaults to initializing with NULL. // There is no way to create an uninitialized ScopedPyObjectPtr. explicit ScopedPyObjectPtr(PyObject* p = NULL) : ptr_(p) { } |