aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/map.h
diff options
context:
space:
mode:
authorGravatar Bo Yang <teboring@google.com>2015-05-24 22:28:04 -0700
committerGravatar Bo Yang <teboring@google.com>2015-05-24 23:03:05 -0700
commitcf603a9dfac6447f2fe62822fa7c235a50a92de7 (patch)
tree51ed90fe381d25a3c8dbb9f3a568bb8fefc18c4d /src/google/protobuf/map.h
parent3ff959256106809aa71af430b9c365ab0b66b935 (diff)
Fix bugs on windows.
Diffstat (limited to 'src/google/protobuf/map.h')
-rw-r--r--src/google/protobuf/map.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index 1858e2f9..f246dd10 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -199,7 +199,7 @@ class Map {
typedef MapAllocator<std::pair<const Key, MapPair<Key, T>*> > Allocator;
// Iterators
- class LIBPROTOBUF_EXPORT const_iterator
+ class const_iterator
: public std::iterator<std::forward_iterator_tag, value_type, ptrdiff_t,
const value_type*, const value_type&> {
typedef typename hash_map<Key, value_type*, hash<Key>, equal_to<Key>,
@@ -229,7 +229,7 @@ class Map {
InnerIt it_;
};
- class LIBPROTOBUF_EXPORT iterator : public std::iterator<std::forward_iterator_tag, value_type> {
+ class iterator : public std::iterator<std::forward_iterator_tag, value_type> {
typedef typename hash_map<Key, value_type*, hasher, equal_to<Key>,
Allocator>::iterator InnerIt;
@@ -428,7 +428,7 @@ class Map {
internal::WireFormatLite::FieldType key_wire_type,
internal::WireFormatLite::FieldType value_wire_type,
int default_enum_value>
- friend class LIBPROTOBUF_EXPORT internal::MapFieldLite;
+ friend class internal::MapFieldLite;
};
} // namespace protobuf