diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-03 10:19:32 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-03 10:19:32 -0700 |
commit | dc80689af3951d078cb556588eece89dd6860c91 (patch) | |
tree | c83b4590f1b58eaf2285bb71ebf757fc723e13e4 /src/google | |
parent | b59bfcb30918382b3787db57d8caa803678f1ac5 (diff) | |
parent | c6095505dc0c1da8a85e4bd9c50917c6286c9724 (diff) | |
download | protobuf-dc80689af3951d078cb556588eece89dd6860c91.tar.gz protobuf-dc80689af3951d078cb556588eece89dd6860c91.tar.bz2 protobuf-dc80689af3951d078cb556588eece89dd6860c91.zip |
Merge pull request #653 from airtimemedia/master
Various compilation fixes
Diffstat (limited to 'src/google')
-rw-r--r-- | src/google/protobuf/compiler/java/java_map_field.cc | 4 | ||||
-rw-r--r-- | src/google/protobuf/compiler/java/java_map_field.h | 3 | ||||
-rw-r--r-- | src/google/protobuf/compiler/java/java_map_field_lite.cc | 4 | ||||
-rw-r--r-- | src/google/protobuf/compiler/java/java_map_field_lite.h | 3 | ||||
-rw-r--r-- | src/google/protobuf/map.h | 2 | ||||
-rw-r--r-- | src/google/protobuf/stubs/mutex.h | 4 |
6 files changed, 7 insertions, 13 deletions
diff --git a/src/google/protobuf/compiler/java/java_map_field.cc b/src/google/protobuf/compiler/java/java_map_field.cc index f25970e5..44b86cd7 100644 --- a/src/google/protobuf/compiler/java/java_map_field.cc +++ b/src/google/protobuf/compiler/java/java_map_field.cc @@ -156,9 +156,7 @@ ImmutableMapFieldGenerator(const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex, Context* context) - : descriptor_(descriptor), messageBitIndex_(messageBitIndex), - builderBitIndex_(builderBitIndex), context_(context), - name_resolver_(context->GetNameResolver()) { + : descriptor_(descriptor), name_resolver_(context->GetNameResolver()) { SetMessageVariables(descriptor, messageBitIndex, builderBitIndex, context->GetFieldGeneratorInfo(descriptor), name_resolver_, &variables_); diff --git a/src/google/protobuf/compiler/java/java_map_field.h b/src/google/protobuf/compiler/java/java_map_field.h index 80a94f45..f2768f3a 100644 --- a/src/google/protobuf/compiler/java/java_map_field.h +++ b/src/google/protobuf/compiler/java/java_map_field.h @@ -68,9 +68,6 @@ class ImmutableMapFieldGenerator : public ImmutableFieldGenerator { private: const FieldDescriptor* descriptor_; map<string, string> variables_; - const int messageBitIndex_; - const int builderBitIndex_; - Context* context_; ClassNameResolver* name_resolver_; }; diff --git a/src/google/protobuf/compiler/java/java_map_field_lite.cc b/src/google/protobuf/compiler/java/java_map_field_lite.cc index ccc1b32e..cd1698f0 100644 --- a/src/google/protobuf/compiler/java/java_map_field_lite.cc +++ b/src/google/protobuf/compiler/java/java_map_field_lite.cc @@ -139,9 +139,7 @@ ImmutableMapFieldLiteGenerator(const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex, Context* context) - : descriptor_(descriptor), messageBitIndex_(messageBitIndex), - builderBitIndex_(builderBitIndex), context_(context), - name_resolver_(context->GetNameResolver()) { + : descriptor_(descriptor), name_resolver_(context->GetNameResolver()) { SetMessageVariables(descriptor, messageBitIndex, builderBitIndex, context->GetFieldGeneratorInfo(descriptor), name_resolver_, &variables_); diff --git a/src/google/protobuf/compiler/java/java_map_field_lite.h b/src/google/protobuf/compiler/java/java_map_field_lite.h index 82472602..a09cd536 100644 --- a/src/google/protobuf/compiler/java/java_map_field_lite.h +++ b/src/google/protobuf/compiler/java/java_map_field_lite.h @@ -67,9 +67,6 @@ class ImmutableMapFieldLiteGenerator : public ImmutableFieldLiteGenerator { private: const FieldDescriptor* descriptor_; map<string, string> variables_; - const int messageBitIndex_; - const int builderBitIndex_; - Context* context_; ClassNameResolver* name_resolver_; }; diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index 163ce9dc..d928b7a7 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -172,7 +172,7 @@ class Map { !defined(GOOGLE_PROTOBUF_OS_NACL) && !defined(GOOGLE_PROTOBUF_OS_ANDROID) template<class NodeType, class... Args> void construct(NodeType* p, Args&&... args) { - new (p) NodeType(std::forward<Args>(args)...); + new ((void*)p) NodeType(std::forward<Args>(args)...); } template<class NodeType> diff --git a/src/google/protobuf/stubs/mutex.h b/src/google/protobuf/stubs/mutex.h index 2cce0561..7ef1cb69 100644 --- a/src/google/protobuf/stubs/mutex.h +++ b/src/google/protobuf/stubs/mutex.h @@ -30,6 +30,10 @@ #ifndef GOOGLE_PROTOBUF_STUBS_MUTEX_H_ #define GOOGLE_PROTOBUF_STUBS_MUTEX_H_ +#ifdef GOOGLE_PROTOBUF_NO_THREADLOCAL +#include <pthread.h> +#endif + #include <google/protobuf/stubs/macros.h> // =================================================================== |