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

Merge pull request #444 from xfxyjwf/vs2010_fix

Browse source 
Fix two issues on vs2010.
This commit is contained in:
Feng Xiao 2015-06-02 21:32:41 -07:00
commit dbcfc5e202
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/google/protobuf/map.h
View file

@ -176,14 +176,12 @@ class Map {
template<class NodeType>
void destroy(NodeType* p) {
if (arena_ == NULL) p->~NodeType();
p->~NodeType();
}
#else
void construct(pointer p, const_reference t) { new (p) value_type(t); }
void destroy(pointer p) {
if (arena_ == NULL) p->~value_type();
}
void destroy(pointer p) { p->~value_type(); }
#endif
template <typename X>
@ -201,10 +199,10 @@ class Map {
return arena_ != other.arena_;
}
// To support Visual Studio 2008
size_type max_size() const {
return std::numeric_limits<size_type>::max();
}
// To support Visual Studio 2008
size_type max_size() const {
return std::numeric_limits<size_type>::max();
}
private:
Arena* arena_;

4
src/google/protobuf/repeated_field.h
View file

@ -1125,7 +1125,9 @@ template <typename Element>
inline typename RepeatedField<Element>::iterator RepeatedField<Element>::erase(
const_iterator first, const_iterator last) {
size_type first_offset = first - cbegin();
Truncate(std::copy(last, cend(), begin() + first_offset) - cbegin());
if (first != last) {
Truncate(std::copy(last, cend(), begin() + first_offset) - cbegin());
}
return begin() + first_offset;
}