[gnuradio/f14/master] * Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 3.2.2-7 - Fix gcc-4.5 build err

[Orcan Ogetbil]

commit bd36704b35074821f447dd6a98146ac54a3b3c16
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Aug 1 01:33:34 2010 -0400

    * Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 3.2.2-7
    - Fix gcc-4.5 build errors

 gnuradio-gcc45.patch |   24 ++++++++++++++++++++++++
 gnuradio.spec        |    8 +++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/gnuradio-gcc45.patch b/gnuradio-gcc45.patch
new file mode 100644
index 0000000..749a820
--- /dev/null
+++ b/gnuradio-gcc45.patch
@@ -0,0 +1,24 @@
+diff -rupN gnuradio.old/usrp2/host/lib/usrp2.cc gnuradio/usrp2/host/lib/usrp2.cc
+--- gnuradio.old/usrp2/host/lib/usrp2.cc	2010-08-01 01:01:48.000000000 -0400
++++ gnuradio/usrp2/host/lib/usrp2.cc	2010-08-01 01:09:45.000000000 -0400
+@@ -38,9 +38,9 @@ namespace usrp2 {
+   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<typename usrp2::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<typename usrp2::usrp2> _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.
+-    usrp2::sptr r(new usrp2::usrp2(ifc, pr, rx_bufsize));
++    usrp2::sptr r(new typename usrp2::usrp2(ifc, pr, rx_bufsize));
+     usrp_table_entry t(key, r);
+     s_table.push_back(t);
+ 
diff --git a/gnuradio.spec b/gnuradio.spec
index cea1c20..4683174 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -2,7 +2,7 @@
 
 Name:		gnuradio
 Version:	3.2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -13,6 +13,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source1:	10-usrp.rules
 Patch0:		gnuradio-3.2-libtool.patch
 Patch1:		gnuradio-3.2-configure.patch
+Patch2:		gnuradio-gcc45.patch
 
 Requires(pre):	shadow-utils
 BuildRequires:	sdcc
@@ -97,6 +98,8 @@ GNU Radio USRP headers
 %setup -q
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .configure
+%patch2 -p1 -b .gcc45
+
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
 
@@ -202,6 +205,9 @@ getent group usrp >/dev/null || groupadd -r usrp
 %{_includedir}/usrp_*
 
 %changelog
+* Sun Aug 01 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 3.2.2-7
+- Fix gcc-4.5 build errors
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 3.2.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild