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

Side by Side Diff: third_party/protobuf/src/google/protobuf/unknown_field_set.cc

Issue 11316370: [sync] Componentize sync: Part 4: Fix includes in third_party/protobuf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Undo exports; Just fix incorrect includes Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « third_party/protobuf/README.chromium ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // http://code.google.com/p/protobuf/ 3 // http://code.google.com/p/protobuf/
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 19 matching lines...) Expand all
30 30
31 // Author: kenton@google.com (Kenton Varda) 31 // Author: kenton@google.com (Kenton Varda)
32 // Based on original Protocol Buffers design by 32 // Based on original Protocol Buffers design by
33 // Sanjay Ghemawat, Jeff Dean, and others. 33 // Sanjay Ghemawat, Jeff Dean, and others.
34 34
35 #include <google/protobuf/stubs/common.h> 35 #include <google/protobuf/stubs/common.h>
36 #include <google/protobuf/unknown_field_set.h> 36 #include <google/protobuf/unknown_field_set.h>
37 #include <google/protobuf/stubs/stl_util-inl.h> 37 #include <google/protobuf/stubs/stl_util-inl.h>
38 #include <google/protobuf/io/coded_stream.h> 38 #include <google/protobuf/io/coded_stream.h>
39 #include <google/protobuf/io/zero_copy_stream.h> 39 #include <google/protobuf/io/zero_copy_stream.h>
40 #include <google/protobuf/io/zero_copy_stream_impl.h> 40 #include <google/protobuf/io/zero_copy_stream_impl_lite.h>
41 #include <google/protobuf/wire_format.h> 41 #include <google/protobuf/wire_format_lite.h>
42 42
43 namespace google { 43 namespace google {
44 namespace protobuf { 44 namespace protobuf {
45 45
46 namespace internal { 46 namespace internal {
47 47
48 int StringSpaceUsedExcludingSelf(const string& str) { 48 int StringSpaceUsedExcludingSelf(const string& str) {
49 const void* start = &str; 49 const void* start = &str;
50 const void* end = &str + 1; 50 const void* end = &str + 1;
51 51
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 group_ = group; 211 group_ = group;
212 break; 212 break;
213 } 213 }
214 default: 214 default:
215 break; 215 break;
216 } 216 }
217 } 217 }
218 218
219 } // namespace protobuf 219 } // namespace protobuf
220 } // namespace google 220 } // namespace google
OLDNEW
« no previous file with comments | « third_party/protobuf/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698