Skip to content

P
protobuf
Unverified Commit a651b77f authored by Adam Cozzette's avatar Adam Cozzette Committed by GitHub
Browse files
Options

Merge pull request #4872 from demon386/master 

Fix SFINAE in 'RepeatedPtrFieldBase::Add'
parents 79700b56 8a1d0262
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/google/protobuf/repeated_field.h
View file @ a651b77f
...@@ -466,7 +466,7 @@ class LIBPROTOBUF_EXPORT RepeatedPtrFieldBase { ...@@ -466,7 +466,7 @@ class LIBPROTOBUF_EXPORT RepeatedPtrFieldBase {
protected: protected:
template <typename TypeHandler> template <typename TypeHandler>
void Add(typename TypeHandler::Type&& value, void Add(typename TypeHandler::Type&& value,
std::enable_if<TypeHandler::Moveable>* dummy = NULL); typename std::enable_if<TypeHandler::Moveable>::type* dummy = NULL);
template <typename TypeHandler> template <typename TypeHandler>
void RemoveLast(); void RemoveLast();
...@@ -1541,7 +1541,7 @@ inline typename TypeHandler::Type* RepeatedPtrFieldBase::Add( ...@@ -1541,7 +1541,7 @@ inline typename TypeHandler::Type* RepeatedPtrFieldBase::Add(
template <typename TypeHandler> template <typename TypeHandler>
inline void RepeatedPtrFieldBase::Add( inline void RepeatedPtrFieldBase::Add(
typename TypeHandler::Type&& value, typename TypeHandler::Type&& value,
std::enable_if<TypeHandler::Moveable>*) { typename std::enable_if<TypeHandler::Moveable>::type*) {
if (rep_ != NULL && current_size_ < rep_->allocated_size) { if (rep_ != NULL && current_size_ < rep_->allocated_size) {
*cast<TypeHandler>(rep_->elements[current_size_++]) = std::move(value); *cast<TypeHandler>(rep_->elements[current_size_++]) = std::move(value);
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment