aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2016-03-31 13:18:03 -0700
committerJisi Liu <jisi.liu@gmail.com>2016-03-31 13:18:03 -0700
commit94aa50ffd6e8994c1ec9c09cc596ec77692e6be7 (patch)
treeb02c615a813675d07f0bc61fc143230647c7e103
parent9e7fa0678dca7b5f8f089b9aff80168e9c200258 (diff)
downloadprotobuf-94aa50ffd6e8994c1ec9c09cc596ec77692e6be7.tar.gz
protobuf-94aa50ffd6e8994c1ec9c09cc596ec77692e6be7.tar.bz2
protobuf-94aa50ffd6e8994c1ec9c09cc596ec77692e6be7.zip
Fix breakage of referring to table_ in static func
Referencing data member table_ in static functions break certain platforms. Change it to refer to the declare type void** instead.
-rw-r--r--src/google/protobuf/map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index b5f34042..3ee4ea76 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -935,7 +935,7 @@ class Map {
const hasher& hash_function() const { return *this; }
static size_type max_size() {
- return static_cast<size_type>(1) << (sizeof(table_) >= 8 ? 60 : 28);
+ return static_cast<size_type>(1) << (sizeof(void**) >= 8 ? 60 : 28);
}
size_type size() const { return num_elements_; }
bool empty() const { return size() == 0; }