boost/variant
2
0
Fork 0
mirror of https://github.com/boostorg/variant.git synced 2026-02-02 21:32:11 +00:00
Code Issues Projects Releases Wiki Activity

Variant: merged fixes for MSVC warnings from trunk

Browse Source 
[SVN r57532]
This commit is contained in:
Hartmut Kaiser
2009-11-10 02:36:45 +00:00
parent 4f4555fa93
commit 4d02fbcd84
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/variant/variant.hpp
View File

@@ -293,7 +293,8 @@ public: // visitor interfaces
{
operand.~T();
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551))
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551)) || \
BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
operand; // suppresses warnings
#endif
@@ -532,6 +533,11 @@ public: // visitor interface
#endif // MSVC6 workaround
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
private:
// silence MSVC warning C4512: assignment operator could not be generated
direct_assigner& operator= (direct_assigner const&);
#endif
};
///////////////////////////////////////////////////////////////////////////////
@@ -650,6 +656,11 @@ public: // visitor interface
BOOST_VARIANT_AUX_RETURN_VOID;
}
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
private:
// silence MSVC warning C4512: assignment operator could not be generated
backup_assigner& operator= (backup_assigner const&);
#endif
};
///////////////////////////////////////////////////////////////////////////////
@@ -899,6 +910,11 @@ public: // internal visitor interfaces, cont.
return internal_visit( operand.get(), 1L );
}
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
private:
// silence MSVC warning C4512: assignment operator could not be generated
invoke_visitor& operator= (invoke_visitor const&);
#endif
};
}} // namespace detail::variant
@@ -1549,6 +1565,11 @@ private: // helpers, for modifiers (below)
BOOST_VARIANT_AUX_RETURN_VOID;
}
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
private:
// silence MSVC warning C4512: assignment operator could not be generated
assigner& operator= (assigner const&);
#endif
};
friend class assigner;