diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-09 17:05:10 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-09 17:05:10 -0800 |
commit | 8d5d7cc6d03b00fcb7162525100fbd4cc0d1929d (patch) | |
tree | 8539b1dce0ae68029b7d74911acaec0ebad353e6 /src/google/protobuf/map.h | |
parent | 496d47c27fd4301411156ebf108188b810f4e902 (diff) | |
download | protobuf-8d5d7cc6d03b00fcb7162525100fbd4cc0d1929d.tar.gz protobuf-8d5d7cc6d03b00fcb7162525100fbd4cc0d1929d.tar.bz2 protobuf-8d5d7cc6d03b00fcb7162525100fbd4cc0d1929d.zip |
Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.v3.0.0-alpha-1
Diffstat (limited to 'src/google/protobuf/map.h')
-rw-r--r-- | src/google/protobuf/map.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index f6ae3e52..6d8a9d03 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -110,7 +110,7 @@ class Map { ~Map() { clear(); } // 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*>::const_iterator InnerIt; @@ -139,7 +139,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*>::iterator InnerIt; public: @@ -302,7 +302,7 @@ class Map { template <typename K, typename V, FieldDescriptor::Type KeyProto, FieldDescriptor::Type ValueProto, int default_enum> - friend class LIBPROTOBUF_EXPORT internal::MapField; + friend class internal::MapField; }; } // namespace protobuf |