diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2018-09-07 16:15:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 16:15:38 -0700 |
| commit | f9d8138376765d229a32635c9209061e4e4aed8c (patch) | |
| tree | 50719686fd7262f405c9bda8694d6c72e7c038b8 /src/google/protobuf/stubs/stringpiece.h | |
| parent | 2e7563f40ec7f901ae8ae1cc749d701fa07e211d (diff) | |
| parent | e53be9bce4556cf0d13e24f1a25a7d75f663144f (diff) | |
| download | protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.gz protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.tar.bz2 protobuf-f9d8138376765d229a32635c9209061e4e4aed8c.zip | |
Merge pull request #5109 from haberman/integrate
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/stubs/stringpiece.h')
| -rw-r--r-- | src/google/protobuf/stubs/stringpiece.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/stringpiece.h b/src/google/protobuf/stubs/stringpiece.h index 6ab985cc..bb5aeed9 100644 --- a/src/google/protobuf/stubs/stringpiece.h +++ b/src/google/protobuf/stubs/stringpiece.h @@ -151,6 +151,8 @@ #include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/hash.h> +#include <google/protobuf/port_def.inc> + namespace google { namespace protobuf { // StringPiece has *two* size types. @@ -175,7 +177,7 @@ typedef string::difference_type stringpiece_ssize_type; #define STRINGPIECE_CHECK_SIZE 0 #endif -class LIBPROTOBUF_EXPORT StringPiece { +class PROTOBUF_EXPORT StringPiece { private: const char* ptr_; stringpiece_ssize_type length_; @@ -487,4 +489,6 @@ template<> struct hash<StringPiece> { }; GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END +#include <google/protobuf/port_undef.inc> + #endif // STRINGS_STRINGPIECE_H_ |