Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
opendht
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
opendht
Commits
57ea0980
Commit
57ea0980
authored
6 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
value: fix chain null check
parent
fec5a6ed
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/opendht/value.h
+3
-3
3 additions, 3 deletions
include/opendht/value.h
with
3 additions
and
3 deletions
include/opendht/value.h
+
3
−
3
View file @
57ea0980
...
@@ -165,8 +165,8 @@ struct OPENDHT_PUBLIC Value
...
@@ -165,8 +165,8 @@ struct OPENDHT_PUBLIC Value
return
chainOr
(
std
::
move
(
f1
),
std
::
move
(
f2
));
return
chainOr
(
std
::
move
(
f1
),
std
::
move
(
f2
));
}
}
static
Filter
chain
(
Filter
&&
f1
,
Filter
&&
f2
)
{
static
Filter
chain
(
Filter
&&
f1
,
Filter
&&
f2
)
{
if
(
not
f1
)
return
std
::
move
(
f
1
);
if
(
not
f1
)
return
std
::
move
(
f
2
);
if
(
not
f2
)
return
std
::
move
(
f
2
);
if
(
not
f2
)
return
std
::
move
(
f
1
);
return
[
f1
,
f2
](
const
Value
&
v
)
{
return
[
f1
,
f2
](
const
Value
&
v
)
{
return
f1
(
v
)
and
f2
(
v
);
return
f1
(
v
)
and
f2
(
v
);
};
};
...
@@ -874,7 +874,7 @@ struct OPENDHT_PUBLIC Query
...
@@ -874,7 +874,7 @@ struct OPENDHT_PUBLIC Query
{
{
static
const
std
::
string
QUERY_PARSE_ERROR
;
static
const
std
::
string
QUERY_PARSE_ERROR
;
Query
(
Select
s
=
{},
Where
w
=
{},
bool
none
=
false
)
:
select
(
s
),
where
(
w
),
none
(
none
)
{
};
Query
(
Select
s
=
{},
Where
w
=
{},
bool
none
=
false
)
:
select
(
s
td
::
move
(
s
)),
where
(
std
::
move
(
w
)
),
none
(
none
)
{
};
/**
/**
* Initializes a query based on a SQL-ish formatted string. The abstract
* Initializes a query based on a SQL-ish formatted string. The abstract
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment