diff --git a/include/boost/bind.hpp b/include/boost/bind.hpp index 11c9fe1..351f180 100644 --- a/include/boost/bind.hpp +++ b/include/boost/bind.hpp @@ -885,7 +885,7 @@ private: #else -template struct bind_t_generator +template struct bind_t_generator { template class implementation @@ -929,30 +929,17 @@ private: }; -#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) -#pragma warning(push) -#pragma warning(disable: 4097) // typedef name 'base' used as a synonym for class -#endif - -template class bind_t: public bind_t_generator::BOOST_NESTED_TEMPLATE implementation +template class bind_t: public bind_t_generator::BOOST_NESTED_TEMPLATE implementation { -private: - - typedef typename bind_t_generator::template implementation base; - public: - bind_t(F f, L const & l): base(f, l) {} + bind_t(F f, L const & l): bind_t_generator::BOOST_NESTED_TEMPLATE implementation(f, l) {} private: bind_t & operator= (bind_t const &); }; -#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) -#pragma warning(pop) -#endif - #endif // add_value