From 7fb9ae9df3adcf49a4c02072739987c53dcce2df Mon Sep 17 00:00:00 2001 From: "kenton@google.com" Date: Wed, 2 Sep 2009 02:42:56 +0000 Subject: Make sure to quality calls to std::swap. Otherwise, if a google::swap() exists (e.g. because the user is using our own dense_hash_map implementation) it will be chosen instead, leading to a compile error. --- src/google/protobuf/generated_message_reflection.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/google/protobuf/generated_message_reflection.cc') diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc index d294e587..e04b93cc 100644 --- a/src/google/protobuf/generated_message_reflection.cc +++ b/src/google/protobuf/generated_message_reflection.cc @@ -324,7 +324,7 @@ void GeneratedMessageReflection::Swap( int has_bits_size = (descriptor_->field_count() + 31) / 32; for (int i = 0; i < has_bits_size; i++) { - swap(has_bits1[i], has_bits2[i]); + std::swap(has_bits1[i], has_bits2[i]); } for (int i = 0; i < descriptor_->field_count(); i++) { @@ -360,8 +360,8 @@ void GeneratedMessageReflection::Swap( switch (field->cpp_type()) { #define SWAP_VALUES(CPPTYPE, TYPE) \ case FieldDescriptor::CPPTYPE_##CPPTYPE: \ - swap(*MutableRaw(message1, field), \ - *MutableRaw(message2, field)); \ + std::swap(*MutableRaw(message1, field), \ + *MutableRaw(message2, field)); \ break; SWAP_VALUES(INT32 , int32 ); @@ -376,8 +376,8 @@ void GeneratedMessageReflection::Swap( #undef SWAP_VALUES case FieldDescriptor::CPPTYPE_STRING: - swap(*MutableRaw(message1, field), - *MutableRaw(message2, field)); + std::swap(*MutableRaw(message1, field), + *MutableRaw(message2, field)); break; default: -- cgit v1.2.3