[Pkg-amule-commits] [SCM] Git repository for pkg-amule branch, master, updated. debian/2.3.1-4-15-g9775d28

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 6536ca2399d34fc2c70651cb9de523b7eafd21e6
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Jun 16 17:04:19 2012 +0200

    Fixed compilation with gcc 4.7; thanks to Lucas Nussbaum for the report; Closes: #674375

diff --git a/debian/patches/gcc_4.7.diff b/debian/patches/gcc_4.7.diff
new file mode 100644
index 0000000..0959f7b
--- /dev/null
+++ b/debian/patches/gcc_4.7.diff
@@ -0,0 +1,23 @@
+Description: Fixed compilation with gcc 4.7
+Origin: http://code.google.com/p/amule/source/detail?r=10772
+Index: amule/src/ObservableQueue.h
+===================================================================
+--- amule.orig/src/ObservableQueue.h	2011-04-12 00:27:40.915973489 +0200
++++ amule/src/ObservableQueue.h	2012-06-16 15:35:15.822669062 +0200
+@@ -331,14 +331,14 @@
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STARTING ), o );
++	this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STOPPING ), o );
++	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4b1296d..900ab2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fallocate.diff
 version_check.diff
 libs-use-dpkg-buildflags.diff
 libupnp-fix-publisherurl.patch
+gcc_4.7.diff

-- 
Git repository for pkg-amule