aboutsummaryrefslogtreecommitdiff
path: root/butl
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2016-07-02 17:27:40 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2016-07-02 18:20:10 +0300
commit8f5677089f439b3ae97c430eb61040287459f63d (patch)
tree58f1bb7d2278c45213f34a2b4e0587dd77b2cca7 /butl
parentbac02200267495741e85db90607186ce4e0593b3 (diff)
Fix operator|(permissions, permissions)
Diffstat (limited to 'butl')
-rw-r--r--butl/filesystem.ixx2
1 files changed, 1 insertions, 1 deletions
diff --git a/butl/filesystem.ixx b/butl/filesystem.ixx
index c2bfa49..037ab8b 100644
--- a/butl/filesystem.ixx
+++ b/butl/filesystem.ixx
@@ -49,7 +49,7 @@ namespace butl
// permissions
//
inline permissions operator& (permissions x, permissions y) {return x &= y;}
- inline permissions operator| (permissions x, permissions y) {return x &= y;}
+ inline permissions operator| (permissions x, permissions y) {return x |= y;}
inline permissions operator&= (permissions& x, permissions y)
{
return x = static_cast<permissions> (