Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side Diff: third_party/protobuf/src/google/protobuf/io/coded_stream_unittest.cc

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
Patch Set: Update to new HEAD (b7632464b4) + restore GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2008 Google Inc. All rights reserved.
3 // https://developers.google.com/protocol-buffers/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include <gtest/gtest.h> 51 #include <gtest/gtest.h>
52 #include <google/protobuf/io/zero_copy_stream_impl.h> 52 #include <google/protobuf/io/zero_copy_stream_impl.h>
53 53
54 54
55 // This declares an unsigned long long integer literal in a portable way. 55 // This declares an unsigned long long integer literal in a portable way.
56 // (The original macro is way too big and ruins my formatting.) 56 // (The original macro is way too big and ruins my formatting.)
57 #undef ULL 57 #undef ULL
58 #define ULL(x) GOOGLE_ULONGLONG(x) 58 #define ULL(x) GOOGLE_ULONGLONG(x)
59 59
60 namespace google { 60 namespace google {
61
61 namespace protobuf { 62 namespace protobuf {
62 namespace io { 63 namespace io {
63 namespace { 64 namespace {
64 65
65 // =================================================================== 66 // ===================================================================
66 // Data-Driven Test Infrastructure 67 // Data-Driven Test Infrastructure
67 68
68 // TEST_1D and TEST_2D are macros I'd eventually like to see added to 69 // TEST_1D and TEST_2D are macros I'd eventually like to see added to
69 // gTest. These macros can be used to declare tests which should be 70 // gTest. These macros can be used to declare tests which should be
70 // run multiple times, once for each item in some input array. TEST_1D 71 // run multiple times, once for each item in some input array. TEST_1D
(...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 EXPECT_EQ(0, errors.size()); 1377 EXPECT_EQ(0, errors.size());
1377 } 1378 }
1378 1379
1379 // =================================================================== 1380 // ===================================================================
1380 1381
1381 1382
1382 } // namespace 1383 } // namespace
1383 } // namespace io 1384 } // namespace io
1384 } // namespace protobuf 1385 } // namespace protobuf
1385 } // namespace google 1386 } // namespace google
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698