From 7828c10367f162456f38cf88662e195c5d5f2f65 Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Sun, 19 Jan 2014 23:37:37 -0800 Subject: [PATCH] bring develop and master in sync wrt include/boost/phoenix/bind/detail/member_variable.hpp --- .../boost/phoenix/bind/detail/member_variable.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/phoenix/bind/detail/member_variable.hpp b/include/boost/phoenix/bind/detail/member_variable.hpp index 29e2ab6..163e33b 100644 --- a/include/boost/phoenix/bind/detail/member_variable.hpp +++ b/include/boost/phoenix/bind/detail/member_variable.hpp @@ -55,6 +55,12 @@ namespace boost { namespace phoenix { namespace detail { return (BOOST_PROTO_GET_POINTER(class_type, obj)->*mp); } + template + RT& operator()(Class* obj) const + { + return obj->*mp; + } + template RT const& operator()(Class const& obj) const { @@ -64,12 +70,6 @@ namespace boost { namespace phoenix { namespace detail { return (BOOST_PROTO_GET_POINTER(class_type, obj)->*mp); } - template - RT& operator()(Class* obj) const - { - return obj->*mp; - } - template RT const& operator()(Class const* obj) const {