feedc0de/boost_bind
1
0
Fork 0
forked from boostorg/bind
Code Pull Requests Activity

Minor void return fixes (MSVC 6 on -W4, g++ 2.95.3)

Browse Source 
[SVN r11706]
This commit is contained in:
Peter Dimov
2001-11-15 14:50:04 +00:00
parent 03dba9a279
commit e3bd44aa77
10 changed files with 235 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/bind.hpp
+11
View File
@@ -1088,14 +1088,25 @@ 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 R, class F, class L> class bind_t
: public bind_t_generator<R>::template implementation<F, L>
{
typedef typename bind_t_generator<R>::template implementation<F, L> base;
public:
bind_t(F f, L const & l): base(f, l) {}
private:
bind_t & operator= (bind_t const &);
};
#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
#pragma warning(pop)
#endif
// add_value
#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
include/boost/mem_fn.hpp
+11 -4
View File
@@ -1141,6 +1141,11 @@ struct mf<void>
};
};
#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
#pragma warning(push)
#pragma warning(disable: 4097) // typedef name 'mf0_' used as a synonym for class
#endif
template<class R, class T, class F = R (T::*) ()>
class mf0: public mf<R>::template mf0_<T, F>
{
@@ -1285,15 +1290,17 @@ class cmf8: public mf<R>::template cmf8_<T, A1, A2, A3, A4, A5, A6, A7, A8, F>
explicit cmf8(F f): cmf8_(f) {}
};
#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
#pragma warning(pop)
#endif
} // namespace _mfi
// mem_fn
#if (defined(_WIN32) || defined(__WIN32__)) && defined(__MWERKS__)
# define BOOST_MEM_FN_ENABLE_STDCALL
#endif
// MSVC 7.0 and Metrowerks 7.1 can't handle the "main line"
#if defined(BOOST_MEM_FN_ENABLE_STDCALL) || (defined(BOOST_MSVC) && BOOST_MSVC <= 1300)
#if defined(BOOST_MEM_FN_ENABLE_STDCALL) || (defined(BOOST_MSVC) && BOOST_MSVC <= 1300) || (defined(__MWERKS__) && (__MWERKS__ <= 0x2406))
#if defined(BOOST_MEM_FN_ENABLE_STDCALL)
#define BOOST_MEM_FN_CC __stdcall