diff options
| author | Stephen D. Huston <shuston@apache.org> | 2015-02-06 21:55:36 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2015-02-06 21:55:36 +0000 |
| commit | eef1eeebe20fb20588d4012f923801d15a05ef6f (patch) | |
| tree | 03b0bcacad73a6feb0cf1c23530e8d5c20bdf6f2 /qpid/cpp/src | |
| parent | 539833c87b86871987dd0dff8944a60313c33728 (diff) | |
| download | qpid-python-eef1eeebe20fb20588d4012f923801d15a05ef6f.tar.gz | |
NO-JIRA - fix compile warning 4250 "inheritance by dominance" on Windows Visual Studio 2013.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1657976 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/LossyLvq.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/LossyLvq.h b/qpid/cpp/src/qpid/broker/LossyLvq.h index e0a266ab77..2665ebe49f 100644 --- a/qpid/cpp/src/qpid/broker/LossyLvq.h +++ b/qpid/cpp/src/qpid/broker/LossyLvq.h @@ -28,6 +28,12 @@ namespace qpid { namespace broker { class MessageMap; +// Disable inherited-by-dominance warning on MSVC. We know. It's ok. +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4250) +#endif + /** * Combination of LossyQueue and Lvq behaviours. */ @@ -36,6 +42,11 @@ class LossyLvq : public Lvq, public LossyQueue public: LossyLvq(const std::string&, std::auto_ptr<MessageMap>, const QueueSettings&, MessageStore* const, management::Manageable*, Broker*); }; + +#ifdef _MSC_VER +# pragma warning(pop) +#endif + }} // namespace qpid::broker #endif /*!QPID_BROKER_LOSSYLVQ_H*/ |