organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Initialize data members in constructors instead of direct initialize in

Browse source 
class definition, which is a C++11 extension.

Change-Id: I477fe484d737f4c60c519d68f431940ffaa33431
This commit is contained in:
Jisi Liu 2015-03-01 21:34:49 -08:00
parent f0e8df3b66
commit 329fa02b42
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/google/protobuf/map_entry_lite.h
View file

@ -359,7 +359,7 @@ class LIBPROTOBUF_EXPORT MapEntryLite : public MessageLite {
typedef void DestructorSkippable_;
};
MapEntryLite() : arena_(NULL) {
MapEntryLite() : default_instance_(NULL), arena_(NULL) {
KeyCppHandler::Initialize(&key_, NULL);
ValueCppHandler::InitializeMaybeByDefaultEnum(
&value_, default_enum_value, NULL);
@ -367,7 +367,7 @@ class LIBPROTOBUF_EXPORT MapEntryLite : public MessageLite {
}
explicit MapEntryLite(Arena* arena)
: arena_(arena) {
: default_instance_(NULL), arena_(arena) {
KeyCppHandler::Initialize(&key_, arena);
ValueCppHandler::InitializeMaybeByDefaultEnum(
&value_, default_enum_value, arena);
@ -382,7 +382,7 @@ class LIBPROTOBUF_EXPORT MapEntryLite : public MessageLite {
default_instance_ = default_instance;
}
MapEntryLite* default_instance_ = NULL;
MapEntryLite* default_instance_;
KeyBase key_;
ValueBase value_;