From b52880892d1a85203e58cdb049877e7ae4c16663 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 13 Jan 2010 19:35:38 -0800 Subject: Added strict compiler flags. Made changes to meet compilation. Added test to verify ip and mac addr code. --- include/usrp_uhd/device_addr.hpp | 4 ++-- include/usrp_uhd/usrp/dboard/interface.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include/usrp_uhd') diff --git a/include/usrp_uhd/device_addr.hpp b/include/usrp_uhd/device_addr.hpp index f0be44c1f..c082d9f84 100644 --- a/include/usrp_uhd/device_addr.hpp +++ b/include/usrp_uhd/device_addr.hpp @@ -18,7 +18,7 @@ namespace usrp_uhd{ */ struct mac_addr_t{ struct ether_addr mac_addr; - mac_addr_t(const std::string &str = "00:00:00:00:00:00"); + mac_addr_t(const std::string &mac_addr_str = "00:00:00:00:00:00"); std::string to_string(void) const; }; @@ -28,7 +28,7 @@ namespace usrp_uhd{ */ struct ip_addr_t{ struct in_addr ip_addr; - ip_addr_t(const std::string &str = "0.0.0.0"); + ip_addr_t(const std::string &ip_addr_str = "0.0.0.0"); std::string to_string(void) const; }; diff --git a/include/usrp_uhd/usrp/dboard/interface.hpp b/include/usrp_uhd/usrp/dboard/interface.hpp index e6fdd9ad1..acbfc6d70 100644 --- a/include/usrp_uhd/usrp/dboard/interface.hpp +++ b/include/usrp_uhd/usrp/dboard/interface.hpp @@ -23,7 +23,7 @@ public: //tells the host which device to use enum spi_dev_t{ SPI_TX_DEV, - SPI_RX_DEV, + SPI_RX_DEV }; //args for writing spi data -- cgit v1.2.3