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

Side by Side Diff: third_party/protobuf/src/google/protobuf/stubs/substitute.h

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update defines Created 4 years, 8 months 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 // http://code.google.com/p/protobuf/ 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.
11 // * Redistributions in binary form must reproduce the above 11 // * Redistributions in binary form must reproduce the above
12 // copyright notice, this list of conditions and the following disclaimer 12 // copyright notice, this list of conditions and the following disclaimer
13 // in the documentation and/or other materials provided with the 13 // in the documentation and/or other materials provided with the
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 const internal::SubstituteArg& arg6 = internal::SubstituteArg(), 161 const internal::SubstituteArg& arg6 = internal::SubstituteArg(),
162 const internal::SubstituteArg& arg7 = internal::SubstituteArg(), 162 const internal::SubstituteArg& arg7 = internal::SubstituteArg(),
163 const internal::SubstituteArg& arg8 = internal::SubstituteArg(), 163 const internal::SubstituteArg& arg8 = internal::SubstituteArg(),
164 const internal::SubstituteArg& arg9 = internal::SubstituteArg()); 164 const internal::SubstituteArg& arg9 = internal::SubstituteArg());
165 165
166 } // namespace strings 166 } // namespace strings
167 } // namespace protobuf 167 } // namespace protobuf
168 } // namespace google 168 } // namespace google
169 169
170 #endif // GOOGLE_PROTOBUF_STUBS_SUBSTITUTE_H_ 170 #endif // GOOGLE_PROTOBUF_STUBS_SUBSTITUTE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698