diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-16 17:19:54 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-16 17:19:54 -0800 |
| commit | 2af3e5c49d9729339af06ce90a5810b316dc1513 (patch) | |
| tree | cd9a4ef9afd2e40eaaf4752f4546499a43cf7555 /host/lib | |
| parent | 8878b35d596e2f4db8b3e0189adfcaee81c8300f (diff) | |
| download | uhd-2af3e5c49d9729339af06ce90a5810b316dc1513.tar.gz uhd-2af3e5c49d9729339af06ce90a5810b316dc1513.tar.bz2 uhd-2af3e5c49d9729339af06ce90a5810b316dc1513.zip | |
uhd: tweaks for windows msvc compiler warnings and errors
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/transport/libusb1_zero_copy.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/io_impl.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
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<unsigned char *>(_recv_buffer_pool->at(i)), // buffer this->get_recv_frame_size(), // length - static_cast<libusb_transfer_cb_fn>(&libusb_async_cb), // callback + libusb_transfer_cb_fn(&libusb_async_cb), // callback static_cast<void *>(&_callbacks.back()), // user_data 0 // timeout ); @@ -173,7 +173,7 @@ public: (send_endpoint & 0x7f) | 0x00, // endpoint static_cast<unsigned char *>(_send_buffer_pool->at(i)), // buffer this->get_send_frame_size(), // length - static_cast<libusb_transfer_cb_fn>(&libusb_async_cb), // callback + libusb_transfer_cb_fn(&libusb_async_cb), // callback static_cast<void *>(&_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<offset_managed_send_buffer *>(obj)->commit(0); } |