Merge minor warning fixes from Trunk.

[SVN r67525]
This commit is contained in:
John Maddock
2010-12-31 18:11:48 +00:00
parent ec49c59545
commit c93d93ccfc
2 changed files with 6 additions and 1 deletions

View File

@ -120,6 +120,11 @@ namespace type_traits_detail {
public:
typedef BOOST_TYPEOF_TPL(declval_b() ? declval_T() : declval_U()) type;
#endif
#if defined(__GNUC__) && __GNUC__ == 3 && (__GNUC_MINOR__ == 2 || __GNUC_MINOR__ == 3)
public:
void public_dummy_function_just_to_silence_warning();
#endif
};
template <class T>

View File

@ -22,7 +22,7 @@ namespace detail {
#ifdef BOOST_MSVC
#pragma warning( push )
#pragma warning( disable : 4584 )
#pragma warning( disable : 4584 4250)
#elif defined __GNUC__
#pragma GCC system_header
#endif