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

Unified Diff: third_party/protobuf/src/google/protobuf/stubs/template_util.h

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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 side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/src/google/protobuf/stubs/template_util.h
diff --git a/third_party/protobuf/src/google/protobuf/stubs/template_util.h b/third_party/protobuf/src/google/protobuf/stubs/template_util.h
index 4f30ffa3bbec2dd91afc88d43803e4d54f144547..feef904beaa58f3ec06c553a25e318ea35bf0d0b 100644
--- a/third_party/protobuf/src/google/protobuf/stubs/template_util.h
+++ b/third_party/protobuf/src/google/protobuf/stubs/template_util.h
@@ -37,7 +37,7 @@
// any changes here, make sure that you're not breaking any platforms.
//
//
-// The names choosen here reflect those used in tr1 and the boost::mpl
+// The names chosen here reflect those used in tr1 and the boost::mpl
// library, there are similar operations used in the Loki library as
// well. I prefer the boost names for 2 reasons:
// 1. I think that portions of the Boost libraries are more likely to
« no previous file with comments | « third_party/protobuf/src/google/protobuf/stubs/substitute.cc ('k') | third_party/protobuf/src/google/protobuf/stubs/time.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698