summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/LossyLvq.h11
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*/