From 6753a094002684a8f14232934c9cdeba13e00e8e Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 18 Mar 2013 00:36:01 +0000 Subject: Fix -Wunused-function warnings (bzr r12221) --- src/ui/control-manager.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index b14f27b8b..9357a17ff 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -37,23 +37,11 @@ ControlFlags operator |(ControlFlags lhs, ControlFlags rhs) return static_cast(static_cast(lhs) | static_cast(rhs)); } -ControlFlags& operator |=(ControlFlags &lhs, ControlFlags rhs) -{ - lhs = lhs | rhs; - return lhs; -} - ControlFlags operator &(ControlFlags lhs, ControlFlags rhs) { return static_cast(static_cast(lhs) & static_cast(rhs)); } -ControlFlags& operator &=(ControlFlags &lhs, ControlFlags rhs) -{ - lhs = lhs & rhs; - return lhs; -} - ControlFlags operator ^(ControlFlags lhs, ControlFlags rhs) { return static_cast(static_cast(lhs) ^ static_cast(rhs)); -- cgit v1.2.3 From 5f108f6e174fd6f4cd968a4f6486d1d620667e29 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 18 Mar 2013 13:07:58 +0000 Subject: Drop remaining unused functions (bzr r12224) --- src/ui/control-manager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/ui/control-manager.cpp') diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index 9357a17ff..62e6ce3a3 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -31,11 +31,12 @@ namespace { std::map > sizeTable; // Note: The following operator overloads are local to this file at the moment to discourage flag manipulation elsewhere. - +/* ControlFlags operator |(ControlFlags lhs, ControlFlags rhs) { return static_cast(static_cast(lhs) | static_cast(rhs)); } +*/ ControlFlags operator &(ControlFlags lhs, ControlFlags rhs) { -- cgit v1.2.3