Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a bug (Winfinite-recursion)

This commit is contained in:
antao 2018-11-01 15:45:23 +08:00 committed by an-tao
parent 6810dd261c
commit 5a56f3b5d3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
orm_lib/inc/drogon/orm/Criteria.h
View File

@ -127,7 +127,8 @@ class Criteria
const Criteria operator&&(Criteria cond1, Criteria cond2)
{
assert(cond1 && cond2);
assert(cond1);
assert(cond2);
Criteria cond;
cond._condString = "( ";
cond._condString += cond1._condString;
@ -150,7 +151,8 @@ const Criteria operator&&(Criteria cond1, Criteria cond2)
}
const Criteria operator||(Criteria cond1, Criteria cond2)
{
assert(cond1 && cond2);
assert(cond1);
assert(cond2);
Criteria cond;
cond._condString = "( ";
cond._condString += cond1._condString;