Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
14fe0c99
Commit
14fe0c99
authored
Mar 02, 2015
by
Jisi Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix hash_map type parameter to add Alloc for other platforms.
Change-Id: Idc5fb65a2cc469d55aff6f2cde0b51b326be0963
parent
0a25cfe6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
hash.h
src/google/protobuf/stubs/hash.h
+6
-4
No files found.
src/google/protobuf/stubs/hash.h
View file @
14fe0c99
...
...
@@ -89,8 +89,9 @@ struct hash<const char*> {
template
<
typename
Key
,
typename
Data
,
typename
HashFcn
=
hash
<
Key
>
,
typename
EqualKey
=
int
>
class
hash_map
:
public
std
::
map
<
Key
,
Data
,
HashFcn
>
{
typename
EqualKey
=
int
,
typename
Alloc
=
std
::
allocator
<
std
::
pair
<
const
Key
,
Data
>
>
>
class
hash_map
:
public
std
::
map
<
Key
,
Data
,
HashFcn
,
Alloc
>
{
public
:
hash_map
(
int
=
0
)
{}
};
...
...
@@ -125,9 +126,10 @@ struct hash<const char*>
template
<
typename
Key
,
typename
Data
,
typename
HashFcn
=
hash
<
Key
>
,
typename
EqualKey
=
int
>
typename
EqualKey
=
int
,
typename
Alloc
=
std
::
allocator
<
std
::
pair
<
const
Key
,
Data
>
>
>
class
hash_map
:
public
GOOGLE_PROTOBUF_HASH_NAMESPACE
::
hash_map
<
Key
,
Data
,
HashFcn
>
{
Key
,
Data
,
HashFcn
,
Alloc
>
{
public
:
hash_map
(
int
=
0
)
{}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment