diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:23:41 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:23:41 -0800 |
| commit | cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9 (patch) | |
| tree | e7e5dd284e2384dfaf1f8eff0eb2f3feab944872 /src/google/protobuf/arena.h | |
| parent | f473bb9903370cc9324b0881873e0d0861f5d325 (diff) | |
| download | protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.gz protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.bz2 protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.zip | |
Integrate changes from Google open-source branch.
Diffstat (limited to 'src/google/protobuf/arena.h')
| -rw-r--r-- | src/google/protobuf/arena.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/arena.h b/src/google/protobuf/arena.h index d0cb163c..4f9e39e1 100644 --- a/src/google/protobuf/arena.h +++ b/src/google/protobuf/arena.h @@ -313,6 +313,8 @@ class LIBPROTOBUF_EXPORT Arena { static const size_t kHeaderSize = sizeof(Block); static google::protobuf::internal::SequenceNumber lifecycle_id_generator_; #ifdef PROTOBUF_USE_DLLS + // Thread local variables cannot be exposed through DLL interface but we can + // wrap them in static functions. static ThreadCache& thread_cache(); #else static GOOGLE_THREAD_LOCAL ThreadCache thread_cache_; |