summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2017-06-13 14:07:02 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2017-06-13 14:07:02 +0000
commite2b40c6bd234224856b9d6469f93e4520597cc36 (patch)
tree57f970e95364e6debf41a630a1e9b004e41f9151 /src
parentUpdate .gitlab-ci.yml (diff)
parentMerge branch 'QuLogic/inkscape-ci-artifacts' (diff)
downloadinkscape-e2b40c6bd234224856b9d6469f93e4520597cc36.tar.gz
inkscape-e2b40c6bd234224856b9d6469f93e4520597cc36.zip
Merge gitlab.com:inkscape/inkscape
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-bool.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/live_effects/lpe-bool.h b/src/live_effects/lpe-bool.h
index 1c0aa0243..ce46f14d1 100644
--- a/src/live_effects/lpe-bool.h
+++ b/src/live_effects/lpe-bool.h
@@ -42,7 +42,7 @@ public:
inline friend bool_op to_bool_op(bool_op_ex val)
{
assert(val <= bool_op_ex_slice);
- (bool_op) val;
+ return (bool_op) val;
}
private: