diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-07-29 01:13:20 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-07-29 01:13:20 +0000 |
| commit | 80b1d62bfcea65c59e2160da71dad84b1bd19cef (patch) | |
| tree | 5423b830c53174fec83a7ea01ff0877e11c1ddb6 /src/google/protobuf/test_util.cc | |
| parent | d2fd0638c309113ccae3731a58e30419f522269a (diff) | |
Submit recent changes from internal branch, including "lite mode" for
C++ and Java. See CHANGES.txt for more details.
Diffstat (limited to 'src/google/protobuf/test_util.cc')
| -rw-r--r-- | src/google/protobuf/test_util.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/google/protobuf/test_util.cc b/src/google/protobuf/test_util.cc index e3e67f67..0637c0a5 100644 --- a/src/google/protobuf/test_util.cc +++ b/src/google/protobuf/test_util.cc @@ -33,7 +33,7 @@ // Sanjay Ghemawat, Jeff Dean, and others. #ifdef _WIN32 -// Verify that #icnluding windows.h does not break anything (e.g. because +// Verify that #including windows.h does not break anything (e.g. because // windows.h #defines GetMessage() as a macro). #include <windows.h> #endif @@ -86,7 +86,7 @@ void TestUtil::SetAllFields(unittest::TestAllTypes* message) { message, message->GetDescriptor()->FindFieldByName("optional_cord"), "125"); -#endif +#endif // !PROTOBUF_TEST_NO_DESCRIPTORS // ----------------------------------------------------------------- @@ -124,7 +124,7 @@ void TestUtil::SetAllFields(unittest::TestAllTypes* message) { message, message->GetDescriptor()->FindFieldByName("repeated_cord"), "225"); -#endif +#endif // !PROTOBUF_TEST_NO_DESCRIPTORS // Add a second one of each field. message->add_repeated_int32 (301); @@ -161,7 +161,7 @@ void TestUtil::SetAllFields(unittest::TestAllTypes* message) { message, message->GetDescriptor()->FindFieldByName("repeated_cord"), "325"); -#endif +#endif // !PROTOBUF_TEST_NO_DESCRIPTORS // ----------------------------------------------------------------- @@ -194,7 +194,7 @@ void TestUtil::SetAllFields(unittest::TestAllTypes* message) { message, message->GetDescriptor()->FindFieldByName("default_cord"), "425"); -#endif +#endif // !PROTOBUF_TEST_NO_DESCRIPTORS } // ------------------------------------------------------------------- @@ -234,7 +234,7 @@ void TestUtil::ModifyRepeatedFields(unittest::TestAllTypes* message) { message, message->GetDescriptor()->FindFieldByName("repeated_cord"), 1, "425"); -#endif +#endif // !PROTOBUF_TEST_NO_DESCRIPTORS } // ------------------------------------------------------------------- |