aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler
diff options
context:
space:
mode:
authorGravatar Veres Lajos <vlajos@gmail.com>2014-11-08 22:59:34 +0000
committerGravatar Veres Lajos <vlajos@gmail.com>2014-11-08 22:59:34 +0000
commitc76807211af6ae86368bcd7651ca707ee7f12f86 (patch)
tree1e19080935d7845ff06facd846ff863d273290e3 /src/google/protobuf/compiler
parentbaca1a8a1aa180c42de6278d3b8286c4496c6a10 (diff)
Diffstat (limited to 'src/google/protobuf/compiler')
-rw-r--r--src/google/protobuf/compiler/command_line_interface.h2
-rw-r--r--src/google/protobuf/compiler/cpp/cpp_unittest.cc2
-rw-r--r--src/google/protobuf/compiler/java/java_file.cc2
-rw-r--r--src/google/protobuf/compiler/java/java_helpers.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h
index 47f28919..74a0adb4 100644
--- a/src/google/protobuf/compiler/command_line_interface.h
+++ b/src/google/protobuf/compiler/command_line_interface.h
@@ -214,7 +214,7 @@ class LIBPROTOC_EXPORT CommandLineInterface {
// true if the next argument in the argv should be used as the value,
// false otherwise.
//
- // Exmaples:
+ // Examples:
// "-Isrc/protos" ->
// name = "-I", value = "src/protos"
// "--cpp_out=src/foo.pb2.cc" ->
diff --git a/src/google/protobuf/compiler/cpp/cpp_unittest.cc b/src/google/protobuf/compiler/cpp/cpp_unittest.cc
index 93e1c3f1..b52ff896 100644
--- a/src/google/protobuf/compiler/cpp/cpp_unittest.cc
+++ b/src/google/protobuf/compiler/cpp/cpp_unittest.cc
@@ -1687,7 +1687,7 @@ TEST_F(OneofTest, SwapBothHasFields) {
EXPECT_EQ(message2.foo_string(), "FOO");
}
-TEST_F(OneofTest, CopyContructor) {
+TEST_F(OneofTest, CopyConstructor) {
unittest::TestOneof2 message1;
message1.set_foo_bytes("FOO");
diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc
index 231b1445..98c1fac9 100644
--- a/src/google/protobuf/compiler/java/java_file.cc
+++ b/src/google/protobuf/compiler/java/java_file.cc
@@ -186,7 +186,7 @@ bool FileGenerator::Validate(string* error) {
// proto2 API without code change. When this happens we'd like to issue an
// warning to let the user know that the outer class name has been changed.
// Although we only do this automatic naming fix for immutable API, mutable
- // outer class name will also be affected as it's contructed from immutable
+ // outer class name will also be affected as it's constructed from immutable
// outer class name with an additional "Mutable" prefix. Since the naming
// change in mutable API is not caused by a naming conflict, we generate the
// warning for immutable API only.
diff --git a/src/google/protobuf/compiler/java/java_helpers.h b/src/google/protobuf/compiler/java/java_helpers.h
index 93f23a93..a00aa902 100644
--- a/src/google/protobuf/compiler/java/java_helpers.h
+++ b/src/google/protobuf/compiler/java/java_helpers.h
@@ -132,7 +132,7 @@ string FieldConstantName(const FieldDescriptor *field);
// Returns the type of the FieldDescriptor.
// This does nothing interesting for the open source release, but is used for
-// hacks that improve compatability with version 1 protocol buffers at Google.
+// hacks that improve compatibility with version 1 protocol buffers at Google.
FieldDescriptor::Type GetType(const FieldDescriptor* field);
enum JavaType {