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
343363aa
Commit
343363aa
authored
Jun 16, 2016
by
vjpai
Committed by
Feng Xiao
Jun 17, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address review comments on function name
parent
4e5dadb1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
map.h
src/google/protobuf/map.h
+2
-2
No files found.
src/google/protobuf/map.h
View file @
343363aa
...
...
@@ -587,7 +587,7 @@ class Map {
explicit
MapAllocator
(
Arena
*
arena
)
:
arena_
(
arena
)
{}
template
<
typename
X
>
MapAllocator
(
const
MapAllocator
<
X
>&
allocator
)
:
arena_
(
allocator
.
arena
_internal_only
())
{}
:
arena_
(
allocator
.
arena
())
{}
pointer
allocate
(
size_type
n
,
const_pointer
hint
=
0
)
{
// If arena is not given, malloc needs to be called which doesn't
...
...
@@ -652,7 +652,7 @@ class Map {
// To support gcc-4.4, which does not properly
// support templated friend classes
Arena
*
arena
_internal_only
()
const
{
Arena
*
arena
()
const
{
return
arena_
;
}
...
...
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