removed some windows warnings

2 files changed, 5 insertions, 4 deletions

diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp
index fea95145c..b23a4dc00 100644
--- a/host/include/uhd/config.hpp
+++ b/host/include/uhd/config.hpp
@@ -31,10 +31,11 @@
 # pragma warning(disable: 4251) // class 'A<T>' needs to have dll-interface to be used by clients of class 'B'
 //# pragma warning(disable: 4127) // conditional expression is constant
 //# pragma warning(disable: 4290) // C++ exception specification ignored except to ...
-//# pragma warning(disable: 4180) // qualifier applied to function type has no meaning; ignored
+# pragma warning(disable: 4180) // qualifier applied to function type has no meaning; ignored
 # pragma warning(disable: 4275) // non dll-interface class ... used as base for dll-interface class ...
 //# pragma warning(disable: 4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
 //# pragma warning(disable: 4511) // 'class' : copy constructor could not be generated
+# pragma warning(disable: 4250) // 'class' : inherits 'method' via dominance
 #endif
 
 //define logical operators
diff --git a/host/lib/transport/udp_zero_copy_asio.cpp b/host/lib/transport/udp_zero_copy_asio.cpp
index 830bfd75e..ced606777 100644
--- a/host/lib/transport/udp_zero_copy_asio.cpp
+++ b/host/lib/transport/udp_zero_copy_asio.cpp
@@ -39,9 +39,9 @@ static const double RECV_TIMEOUT = 0.1; //100 ms
  *   send and recv requires a copy operation to/from userspace.
  **********************************************************************/
 class udp_zero_copy_impl:
-    public virtual phony_zero_copy_recv_if,
-    public virtual phony_zero_copy_send_if,
-    public virtual udp_zero_copy
+    public phony_zero_copy_recv_if,
+    public phony_zero_copy_send_if,
+    public udp_zero_copy
 {
 public:
     typedef boost::shared_ptr<udp_zero_copy_impl> sptr;