[gentoo-commits] gentoo-x86 commit in media-libs/raul/files: raul-0.8.0-gcc47.patch

[gentoo-commits] gentoo-x86 commit in media-libs/raul/files: raul-0.8.0-gcc47.patch

[Alexis Ballier (aballier)]

aballier    12/11/24 14:36:49

  Added:                raul-0.8.0-gcc47.patch
  Log:
  fix build with gcc 4.7, bug #425274
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.1                  media-libs/raul/files/raul-0.8.0-gcc47.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/raul/files/raul-0.8.0-gcc47.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/raul/files/raul-0.8.0-gcc47.patch?rev=1.1&content-type=text/plain

Index: raul-0.8.0-gcc47.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=425274
Build with gcc 4.7

Index: raul-0.8.0/raul/PathTable.hpp
===================================================================
--- raul-0.8.0.orig/raul/PathTable.hpp
+++ raul-0.8.0/raul/PathTable.hpp
@@ -37,13 +37,13 @@ public:
 	typename Table<Path, T>::iterator find_descendants_end(
 			typename Table<Path, T>::iterator parent)
 	{
-		return find_range_end(parent, &Path::descendant_comparator);
+		return this->find_range_end(parent, &Path::descendant_comparator);
 	}
 
 	typename Table<Path, T>::const_iterator find_descendants_end(
 			typename Table<Path, T>::const_iterator parent) const
 	{
-		return find_range_end(parent, &Path::descendant_comparator);
+		return this->find_range_end(parent, &Path::descendant_comparator);
 	}
 };
 
Index: raul-0.8.0/raul/TableImpl.hpp
===================================================================
--- raul-0.8.0.orig/raul/TableImpl.hpp
+++ raul-0.8.0/raul/TableImpl.hpp
@@ -249,7 +249,7 @@ Table<K, T>::cram(const Table<K,T>& rang
 	assert(is_sorted());
 #endif
 
-	return make_pair(iterator(*this, insert_index), true);
+	return std::make_pair(iterator(*this, insert_index), true);
 }
 
 
@@ -339,7 +339,7 @@ Table<K, T>::operator[](const K& key)
 	if (i != end()) {
 		return i->second;
 	} else {
-		std::pair<iterator,bool> ret = insert(make_pair(key, T()));
+		std::pair<iterator,bool> ret = insert(std::make_pair(key, T()));
 		return ret.first->second;
 	}
 }