From 2af3e5c49d9729339af06ce90a5810b316dc1513 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 16 Feb 2011 17:19:54 -0800 Subject: uhd: tweaks for windows msvc compiler warnings and errors --- host/lib/transport/libusb1_zero_copy.cpp | 4 ++-- host/lib/usrp/usrp1/io_impl.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'host/lib') diff --git a/host/lib/transport/libusb1_zero_copy.cpp b/host/lib/transport/libusb1_zero_copy.cpp index 60f290fcf..87adece45 100644 --- a/host/lib/transport/libusb1_zero_copy.cpp +++ b/host/lib/transport/libusb1_zero_copy.cpp @@ -147,7 +147,7 @@ public: (recv_endpoint & 0x7f) | 0x80, // endpoint static_cast(_recv_buffer_pool->at(i)), // buffer this->get_recv_frame_size(), // length - static_cast(&libusb_async_cb), // callback + libusb_transfer_cb_fn(&libusb_async_cb), // callback static_cast(&_callbacks.back()), // user_data 0 // timeout ); @@ -173,7 +173,7 @@ public: (send_endpoint & 0x7f) | 0x00, // endpoint static_cast(_send_buffer_pool->at(i)), // buffer this->get_send_frame_size(), // length - static_cast(&libusb_async_cb), // callback + libusb_transfer_cb_fn(&libusb_async_cb), // callback static_cast(&_callbacks.back()), // user_data 0 // timeout ); diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp index e28b6efb5..8beeccf8f 100644 --- a/host/lib/usrp/usrp1/io_impl.cpp +++ b/host/lib/usrp/usrp1/io_impl.cpp @@ -84,7 +84,7 @@ public: } private: - static void fake_deleter(void */*obj*/){ + static void fake_deleter(void *){ //dont do anything and assume the bastard committed it //static_cast(obj)->commit(0); } -- cgit v1.2.3