From 905681b7b16210b1a70e702ee7838d3889b023c3 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Fri, 24 Jul 2020 14:28:19 +0100 Subject: [PATCH] Fix a few more spelling mistakes --- conformance/third_party/jsoncpp/json.h | 2 +- .../main/java/com/google/protobuf/GeneratedMessageLite.java | 2 +- python/google/protobuf/pyext/scoped_pyobject_ptr.h | 2 +- src/google/protobuf/compiler/js/js_generator.h | 4 ++-- src/google/protobuf/compiler/python/python_generator.cc | 2 +- src/google/protobuf/descriptor_unittest.cc | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conformance/third_party/jsoncpp/json.h b/conformance/third_party/jsoncpp/json.h index eb0ee17a5e..5dc26de8b6 100644 --- a/conformance/third_party/jsoncpp/json.h +++ b/conformance/third_party/jsoncpp/json.h @@ -1371,7 +1371,7 @@ public: */ std::string getFormattedErrorMessages() const; - /** \brief Returns a vector of structured errors encounted while parsing. + /** \brief Returns a vector of structured errors encountered while parsing. * \return A (possibly empty) vector of StructuredError objects. Currently * only one error can be returned, but the caller should tolerate * multiple diff --git a/java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java b/java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java index 07b008004c..27f5210097 100644 --- a/java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java +++ b/java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java @@ -223,7 +223,7 @@ public abstract class GeneratedMessageLite< /** * A method that implements different types of operations described in {@link MethodToInvoke}. - * Theses different kinds of operations are required to implement message-level operations for + * These different kinds of operations are required to implement message-level operations for * builders in the runtime. This method bundles those operations to reduce the generated methods * count. * diff --git a/python/google/protobuf/pyext/scoped_pyobject_ptr.h b/python/google/protobuf/pyext/scoped_pyobject_ptr.h index 9faaa4f93b..6f7fc29813 100644 --- a/python/google/protobuf/pyext/scoped_pyobject_ptr.h +++ b/python/google/protobuf/pyext/scoped_pyobject_ptr.h @@ -77,7 +77,7 @@ class ScopedPythonPtr { PyObject* as_pyobject() const { return reinterpret_cast(ptr_); } - // Increments the reference count fo the current object. + // Increments the reference count of the current object. // Should not be called when no object is held. void inc() const { Py_INCREF(ptr_); } diff --git a/src/google/protobuf/compiler/js/js_generator.h b/src/google/protobuf/compiler/js/js_generator.h index 3e7221b77c..e452020a77 100644 --- a/src/google/protobuf/compiler/js/js_generator.h +++ b/src/google/protobuf/compiler/js/js_generator.h @@ -125,10 +125,10 @@ struct GeneratorOptions { std::string extension; // Create a separate output file for each input file? bool one_output_file_per_input_file; - // If true, we should append annotations as commen on the last line for + // If true, we should append annotations as comments on the last line for // generated .js file. Annotations used by tools like https://kythe.io // to provide cross-references between .js and .proto files. Annotations - // are enced as base64 proto of GeneratedCodeInfo message (see + // are encoded as base64 proto of GeneratedCodeInfo message (see // descriptor.proto). bool annotate_code; }; diff --git a/src/google/protobuf/compiler/python/python_generator.cc b/src/google/protobuf/compiler/python/python_generator.cc index fd42882a08..f2a97cf636 100644 --- a/src/google/protobuf/compiler/python/python_generator.cc +++ b/src/google/protobuf/compiler/python/python_generator.cc @@ -1067,7 +1067,7 @@ void Generator::FixContainingTypeInDescriptor( } // Prints statements setting the message_type and enum_type fields in the -// Python descriptor objects we've already output in ths file. We must +// Python descriptor objects we've already output in the file. We must // do this in a separate step due to circular references (otherwise, we'd // just set everything in the initial assignment statements). void Generator::FixForeignFieldsInDescriptors() const { diff --git a/src/google/protobuf/descriptor_unittest.cc b/src/google/protobuf/descriptor_unittest.cc index 6085a122a8..a5d41b7692 100644 --- a/src/google/protobuf/descriptor_unittest.cc +++ b/src/google/protobuf/descriptor_unittest.cc @@ -479,7 +479,7 @@ TEST_F(FileDescriptorTest, FindExtensionByNumber) { TEST_F(FileDescriptorTest, BuildAgain) { - // Test that if te call BuildFile again on the same input we get the same + // Test that if we call BuildFile again on the same input we get the same // FileDescriptor back. FileDescriptorProto file; foo_file_->CopyTo(&file);