diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-08-29 16:42:55 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-29 16:42:55 -0700 |
| commit | 0087da9d4775f79c67362cc89c653f3a33a9bae2 (patch) | |
| tree | 7206d741b7a4d9d256410e76c932dfa60790bf91 /src/google/protobuf/repeated_field.h | |
| parent | cee703d736fb7e6e001ac22476390b5ccc0d794a (diff) | |
| parent | f0640b5a046522d7ffbab02b87a8ce9a654f79d1 (diff) | |
Merge remote-tracking branch 'origin/master' into beta-1
Conflicts:
src/google/protobuf/extension_set.h
Diffstat (limited to 'src/google/protobuf/repeated_field.h')
| -rw-r--r-- | src/google/protobuf/repeated_field.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index 137b29be..b10e7a95 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -649,7 +649,8 @@ inline const Message& GenericTypeHandler<Message>::default_instance() { // StringTypeHandler is exported. So, we factor out StringTypeHandlerBase, // export that, then make StringTypeHandler be a subclass which is NOT // exported. -// TODO(kenton): There has to be a better way. +// TODO(kenton): Now that StringSpaceUsedExcludingSelf() is in the lite
+// library, this can be cleaned up. class LIBPROTOBUF_EXPORT StringTypeHandlerBase { public: typedef string Type; |