Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
ZODB
Commits
0ffa6aa9
Commit
0ffa6aa9
authored
May 08, 2011
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reindented.
parent
55ed9237
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
139 additions
and
139 deletions
+139
-139
src/BTrees/MergeTemplate.c
src/BTrees/MergeTemplate.c
+23
-23
src/BTrees/SetOpTemplate.c
src/BTrees/SetOpTemplate.c
+116
-116
No files found.
src/BTrees/MergeTemplate.c
View file @
0ffa6aa9
...
@@ -10,13 +10,13 @@
...
@@ -10,13 +10,13 @@
WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
FOR A PARTICULAR PURPOSE
FOR A PARTICULAR PURPOSE
****************************************************************************/
****************************************************************************/
#define MERGETEMPLATE_C "$Id$\n"
#define MERGETEMPLATE_C "$Id$\n"
/****************************************************************************
/****************************************************************************
Set operations
Set operations
****************************************************************************/
****************************************************************************/
static
int
static
int
merge_output
(
Bucket
*
r
,
SetIteration
*
i
,
int
mapping
)
merge_output
(
Bucket
*
r
,
SetIteration
*
i
,
int
mapping
)
...
...
src/BTrees/SetOpTemplate.c
View file @
0ffa6aa9
...
@@ -10,11 +10,11 @@
...
@@ -10,11 +10,11 @@
WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
FOR A PARTICULAR PURPOSE
FOR A PARTICULAR PURPOSE
****************************************************************************/
****************************************************************************/
/****************************************************************************
/****************************************************************************
Set operations
Set operations
****************************************************************************/
****************************************************************************/
#define SETOPTEMPLATE_C "$Id$\n"
#define SETOPTEMPLATE_C "$Id$\n"
...
@@ -145,7 +145,7 @@ initSetIteration(SetIteration *i, PyObject *s, int useValues)
...
@@ -145,7 +145,7 @@ initSetIteration(SetIteration *i, PyObject *s, int useValues)
static
int
static
int
copyRemaining
(
Bucket
*
r
,
SetIteration
*
i
,
int
merge
,
copyRemaining
(
Bucket
*
r
,
SetIteration
*
i
,
int
merge
,
/* See comment # 42 */
/* See comment # 42 */
#ifdef MERGE
#ifdef MERGE
VALUE_TYPE
w
)
VALUE_TYPE
w
)
#else
#else
...
@@ -201,16 +201,16 @@ static PyObject *
...
@@ -201,16 +201,16 @@ static PyObject *
set_operation
(
PyObject
*
s1
,
PyObject
*
s2
,
set_operation
(
PyObject
*
s1
,
PyObject
*
s2
,
int
usevalues1
,
int
usevalues2
,
int
usevalues1
,
int
usevalues2
,
/* Comment # 42
/* Comment # 42
The following ifdef works around a template/type problem
The following ifdef works around a template/type problem
Weights are passed as integers. In particular, the weight passed by
Weights are passed as integers. In particular, the weight passed by
difference is one. This works fine in the int value and float value
difference is one. This works fine in the int value and float value
cases but makes no sense in the object value case. In the object
cases but makes no sense in the object value case. In the object
value case, we don't do merging, so we don't use the weights, so it
value case, we don't do merging, so we don't use the weights, so it
doesn't matter what they are.
doesn't matter what they are.
*/
*/
#ifdef MERGE
#ifdef MERGE
VALUE_TYPE
w1
,
VALUE_TYPE
w2
,
VALUE_TYPE
w1
,
VALUE_TYPE
w2
,
#else
#else
...
@@ -238,7 +238,7 @@ doesn't matter what they are.
...
@@ -238,7 +238,7 @@ doesn't matter what they are.
SetIteration
t
;
SetIteration
t
;
int
i
;
int
i
;
/* See comment # 42 above */
/* See comment # 42 above */
#ifdef MERGE
#ifdef MERGE
VALUE_TYPE
v
;
VALUE_TYPE
v
;
#else
#else
...
@@ -342,11 +342,11 @@ doesn't matter what they are.
...
@@ -342,11 +342,11 @@ doesn't matter what they are.
return
OBJECT
(
r
);
return
OBJECT
(
r
);
#ifndef MERGE_DEFAULT
#ifndef MERGE_DEFAULT
invalid_set_operation:
invalid_set_operation:
PyErr_SetString
(
PyExc_TypeError
,
"invalid set operation"
);
PyErr_SetString
(
PyExc_TypeError
,
"invalid set operation"
);
#endif
#endif
err:
err:
finiSetIteration
(
&
i1
);
finiSetIteration
(
&
i1
);
finiSetIteration
(
&
i2
);
finiSetIteration
(
&
i2
);
Py_XDECREF
(
r
);
Py_XDECREF
(
r
);
...
@@ -548,7 +548,7 @@ multiunion_m(PyObject *ignored, PyObject *args)
...
@@ -548,7 +548,7 @@ multiunion_m(PyObject *ignored, PyObject *args)
}
}
return
(
PyObject
*
)
result
;
return
(
PyObject
*
)
result
;
Error:
Error:
Py_DECREF
(
result
);
Py_DECREF
(
result
);
Py_XDECREF
(
set
);
Py_XDECREF
(
set
);
finiSetIteration
(
&
setiter
);
finiSetIteration
(
&
setiter
);
...
...
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