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

Merge pull request #1360 from pherl/master

Browse source 
Use the T() instead of NULL for the default value.
This commit is contained in:
Jisi Liu 2016-03-30 11:28:54 -07:00
commit a25e9964b1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google/protobuf/stubs/statusor.h
View file

@ -224,7 +224,7 @@ inline StatusOr<T>& StatusOr<T>::operator=(const StatusOr<T>& other) {
template<typename T>
template<typename U>
inline StatusOr<T>::StatusOr(const StatusOr<U>& other)
: status_(other.status_), value_(other.status_.ok() ? other.value_ : NULL) {
: status_(other.status_), value_(other.status_.ok() ? other.value_ : T()) {
}
template<typename T>