From a4e89e70e21dfa5cecef7df3efc1edffb5cd92bd Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sun, 13 Apr 2008 19:28:46 +0000
Subject: Make run-cc handle containers of std::pair, and also filtering for
 std::{vector,string}::iterator

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9491 e03df62e-2008-0410-955e-edbf42e46eb7
---
 make/run-cc.pl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/make/run-cc.pl b/make/run-cc.pl
index 8ca216c4e..e5f29ec7f 100755
--- a/make/run-cc.pl
+++ b/make/run-cc.pl
@@ -26,9 +26,8 @@ my $location = "";
 my @msgfilters = (
 	[ qr/^(.*) warning: cannot pass objects of non-POD type `(.*)' through `\.\.\.'; call will abort at runtime/ => sub {
 		my ($msg, $where, $type) = @_;
-		print $location;
+		my $errstr = $location . "$where error: cannot pass objects of non-POD type `$type' through `...'\n";
 		$location = "";
-		my $errstr = "$where error: cannot pass objects of non-POD type `$type' through `...'\n";
 		if ($type =~ m/::(basic_)?string/) {
 			$errstr .= "$where (Did you forget to call c_str()?)\n";
 		}
@@ -85,9 +84,15 @@ my @msgfilters = (
 		$msg =~ s/std::basic_string\<char\, std\:\:char_traits\<char\>, std::allocator\<char\> \>(\s+|)/std::string/g;
 		$msg =~ s/std::basic_string\<char\, .*?irc_char_traits\<char\>, std::allocator\<char\> \>(\s+|)/irc::string/g;
 		for my $stl (qw(deque vector list)) {
-			$msg =~ s/std::$stl\<(\S+), std::allocator\<(\1)\> \>/std::$stl\<$1\>/g;
+			$msg =~ s/std::$stl\<(\S+), std::allocator\<\1\> \>/std::$stl\<$1\>/g;
+			$msg =~ s/std::$stl\<(std::pair\<\S+, \S+\>), std::allocator\<\1 \> \>/std::$stl<$1 >/g;
 		}
-		$msg =~ s/std::map\<(\S+), (\S+), std::less\<\1\>, std::allocator\<std::pair\<const \1, \2\> \> \>/std::map\<$1, $2\>/g;
+		$msg =~ s/std::map\<(\S+), (\S+), std::less\<\1\>, std::allocator\<std::pair\<const \1, \2\> \> \>/std::map<$1, $2>/g;
+		# Warning: These filters are GNU C++ specific!
+		$msg =~ s/__gnu_cxx::__normal_iterator\<(\S+)\*, std::vector\<\1\> \>/std::vector<$1>::iterator/g;
+		$msg =~ s/__gnu_cxx::__normal_iterator\<(std::pair\<\S+, \S+\>)\*, std::vector\<\1 \> \>/std::vector<$1 >::iterator/g;
+		$msg =~ s/__gnu_cxx::__normal_iterator\<char\*, std::string\>/std::string::iterator/g;
+		$msg =~ s/__gnu_cxx::__normal_iterator\<char\*, irc::string\>/irc::string::iterator/g;
 		return $msg;
 	} ],
 );
-- 
cgit v1.2.3