Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
5df0ed9a
Commit
5df0ed9a
authored
Oct 11, 2016
by
doko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- dictobject.c: Make dict_merge symbol a static symbol
parent
8b531f97
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
Objects/dictobject.c
Objects/dictobject.c
+1
-1
No files found.
Objects/dictobject.c
View file @
5df0ed9a
...
@@ -2372,7 +2372,7 @@ Return:
...
@@ -2372,7 +2372,7 @@ Return:
return
Py_SAFE_DOWNCAST
(
i
,
Py_ssize_t
,
int
);
return
Py_SAFE_DOWNCAST
(
i
,
Py_ssize_t
,
int
);
}
}
int
static
int
dict_merge
(
PyObject
*
a
,
PyObject
*
b
,
int
override
)
dict_merge
(
PyObject
*
a
,
PyObject
*
b
,
int
override
)
{
{
PyDictObject
*
mp
,
*
other
;
PyDictObject
*
mp
,
*
other
;
...
...
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