diff --git a/include/boost/exception/detail/error_info_impl.hpp b/include/boost/exception/detail/error_info_impl.hpp index ecd086d..ed593be 100644 --- a/include/boost/exception/detail/error_info_impl.hpp +++ b/include/boost/exception/detail/error_info_impl.hpp @@ -47,24 +47,24 @@ boost typedef T value_type; - error_info( value_type const & value ); + error_info( value_type const & v ); #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES error_info( error_info const & ); - error_info( value_type && value ) BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(value_type(std::move(value)))); - error_info( error_info && x ) BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(value_type(std::move(x.value_)))); + error_info( value_type && v ) BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(value_type(std::move(v)))); + error_info( error_info && x ) BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(value_type(std::move(x.v_)))); #endif ~error_info() throw(); value_type const & value() const { - return value_; + return v_; } value_type & value() { - return value_; + return v_; } private: @@ -75,7 +75,7 @@ boost std::string name_value_string() const; - value_type value_; + value_type v_; }; } diff --git a/include/boost/exception/info.hpp b/include/boost/exception/info.hpp index f06df42..5b7c17b 100644 --- a/include/boost/exception/info.hpp +++ b/include/boost/exception/info.hpp @@ -41,8 +41,8 @@ boost template inline error_info:: - error_info( value_type const & value ): - value_(value) + error_info( value_type const & v ): + v_(v) { } @@ -51,21 +51,21 @@ boost inline error_info:: error_info( error_info const & x ): - value_(x.value_) + v_(x.v_) { } template inline error_info:: - error_info( value_type && value ) BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(value_type(std::move(value)))): - value_(std::move(value)) + error_info( value_type && v ) BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(value_type(std::move(v)))): + v_(std::move(v)) { } template inline error_info:: - error_info( error_info && x ) BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(value_type(std::move(x.value_)))): - value_(std::move(x.value_)) + error_info( error_info && x ) BOOST_NOEXCEPT_IF(BOOST_NOEXCEPT_EXPR(value_type(std::move(x.v_)))): + v_(std::move(x.v_)) { } #endif