From a2577b41809719b10a1c47ce0eca2912d887c79f Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Thu, 1 Aug 2013 00:28:01 +0200 Subject: [PATCH] buffer: move Buffer::Flags operator as friends defined inside Buffer --- src/buffer.hh | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/buffer.hh b/src/buffer.hh index 0cc20fd0..fcc18a12 100644 --- a/src/buffer.hh +++ b/src/buffer.hh @@ -203,35 +203,35 @@ private: OptionManager m_options; HookManager m_hooks; + + friend constexpr Flags operator|(Flags lhs, Flags rhs) + { + return (Flags)((int) lhs | (int) rhs); + } + + friend Flags& operator|=(Flags& lhs, Flags rhs) + { + (int&) lhs |= (int) rhs; + return lhs; + } + + friend constexpr bool operator&(Flags lhs, Flags rhs) + { + return ((int) lhs & (int) rhs) != 0; + } + + friend Flags& operator&=(Flags& lhs, Flags rhs) + { + (int&) lhs &= (int) rhs; + return lhs; + } + + friend constexpr Flags operator~(Flags lhs) + { + return (Flags)(~(int)lhs); + } }; -constexpr Buffer::Flags operator|(Buffer::Flags lhs, Buffer::Flags rhs) -{ - return (Buffer::Flags)((int) lhs | (int) rhs); -} - -inline Buffer::Flags& operator|=(Buffer::Flags& lhs, Buffer::Flags rhs) -{ - (int&) lhs |= (int) rhs; - return lhs; -} - -constexpr bool operator&(Buffer::Flags lhs, Buffer::Flags rhs) -{ - return ((int) lhs & (int) rhs) != 0; -} - -inline Buffer::Flags& operator&=(Buffer::Flags& lhs, Buffer::Flags rhs) -{ - (int&) lhs &= (int) rhs; - return lhs; -} - -constexpr Buffer::Flags operator~(Buffer::Flags lhs) -{ - return (Buffer::Flags)(~(int)lhs); -} - struct BufferListenerRegisterFuncs { static void insert(const Buffer& buffer, BufferChangeListener& listener)