projects
/
debian
/
gnuradio
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e2073dd
)
usrp2: fixes for gcc 4.5.0 compatibility
author
Moeller
<Moeller23@gmx.de>
Thu, 5 Aug 2010 01:53:01 +0000
(18:53 -0700)
committer
Johnathan Corgan
<jcorgan@corganenterprises.com>
Thu, 5 Aug 2010 01:53:01 +0000
(18:53 -0700)
usrp2/host/lib/usrp2.cc
patch
|
blob
|
history
diff --git
a/usrp2/host/lib/usrp2.cc
b/usrp2/host/lib/usrp2.cc
index f0ee564be002e6702c34019b3e030c8a305da442..0842482e40b37229c9ef832107fc250e771aba8e 100644
(file)
--- a/
usrp2/host/lib/usrp2.cc
+++ b/
usrp2/host/lib/usrp2.cc
@@
-38,9
+38,9
@@
namespace usrp2 {
struct usrp_table_entry {
// inteface + normalized mac addr ("eth0:01:23:45:67:89:ab")
std::string key;
struct usrp_table_entry {
// inteface + normalized mac addr ("eth0:01:23:45:67:89:ab")
std::string key;
- boost::weak_ptr<usrp2
::usrp2
> value;
+ boost::weak_ptr<usrp2> value;
- usrp_table_entry(const std::string &_key, boost::weak_ptr<usrp2
::usrp2
> _value)
+ usrp_table_entry(const std::string &_key, boost::weak_ptr<usrp2> _value)
: key(_key), value(_value) {}
};
: key(_key), value(_value) {}
};
@@
-70,7
+70,7
@@
namespace usrp2 {
// We don't have the USRP2 we're looking for
// create a new one and stick it in the table.
// We don't have the USRP2 we're looking for
// create a new one and stick it in the table.
- usrp2::sptr r(new usrp2
::usrp2
(ifc, pr, rx_bufsize));
+ usrp2::sptr r(new usrp2(ifc, pr, rx_bufsize));
usrp_table_entry t(key, r);
s_table.push_back(t);
usrp_table_entry t(key, r);
s_table.push_back(t);