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
c25f833b
Commit
c25f833b
authored
Jan 13, 2010
by
kenton@google.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes compile on GCC 3.2 according to Sergey Tihansky.
parent
7db148f9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
repeated_field.h
src/google/protobuf/repeated_field.h
+1
-1
No files found.
src/google/protobuf/repeated_field.h
View file @
c25f833b
...
...
@@ -675,7 +675,7 @@ template <typename TypeHandler>
inline
void
RepeatedPtrFieldBase
::
MergeFrom
(
const
RepeatedPtrFieldBase
&
other
)
{
Reserve
(
current_size_
+
other
.
current_size_
);
for
(
int
i
=
0
;
i
<
other
.
current_size_
;
i
++
)
{
TypeHandler
::
Merge
(
other
.
Get
<
TypeHandler
>
(
i
),
Add
<
TypeHandler
>
());
TypeHandler
::
Merge
(
other
.
template
Get
<
TypeHandler
>
(
i
),
Add
<
TypeHandler
>
());
}
}
...
...
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