Эх сурвалжийг харах

Remove export macros for classes nested in a template class.

Jisi Liu 9 жил өмнө
parent
commit
cbfd9d43c8

+ 3 - 3
src/google/protobuf/map.h

@@ -663,7 +663,7 @@ class Map {
   // custom class here and for Node, below, to ensure that k_ is at offset 0,
   // custom class here and for Node, below, to ensure that k_ is at offset 0,
   // allowing safe conversion from pointer to Node to pointer to Key, and vice
   // allowing safe conversion from pointer to Node to pointer to Key, and vice
   // versa when appropriate.
   // versa when appropriate.
-  class LIBPROTOBUF_EXPORT KeyValuePair {
+  class KeyValuePair {
    public:
    public:
     KeyValuePair(const Key& k, value_type* v) : k_(k), v_(v) {}
     KeyValuePair(const Key& k, value_type* v) : k_(k), v_(v) {}
 
 
@@ -708,7 +708,7 @@ class Map {
   // 8. Mutations to a map do not invalidate the map's iterators, pointers to
   // 8. Mutations to a map do not invalidate the map's iterators, pointers to
   //    elements, or references to elements.
   //    elements, or references to elements.
   // 9. Except for erase(iterator), any non-const method can reorder iterators.
   // 9. Except for erase(iterator), any non-const method can reorder iterators.
-  class LIBPROTOBUF_EXPORT InnerMap : private hasher {
+  class InnerMap : private hasher {
    public:
    public:
     typedef value_type* Value;
     typedef value_type* Value;
 
 
@@ -1340,7 +1340,7 @@ class Map {
 
 
  public:
  public:
   // Iterators
   // Iterators
-  class LIBPROTOBUF_EXPORT iterator_base {
+  class iterator_base {
    public:
    public:
     // We support "old style" and "new style" iterators for now. This is
     // We support "old style" and "new style" iterators for now. This is
     // temporary.  Also, for "iterator()" we have an unknown category.
     // temporary.  Also, for "iterator()" we have an unknown category.