Author: shuston
Date: Fri Feb 6 21:55:36 2015
New Revision: 1657976
URL: http://svn.apache.org/r1657976
Log:
NO-JIRA - fix compile warning 4250 "inheritance by dominance" on Windows Visual
Studio 2013.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h?rev=1657976&r1=1657975&r2=1657976&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h Fri Feb 6 21:55:36 2015
@@ -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 Loss
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*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
