linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 424
committer: Razzloss <razzloss@xxxxxxxxx>
branch nick: master
timestamp: Tue 2012-10-16 22:48:22 +0300
message:
  Fix compile error on Solaris.
modified:
  linux/WulforUtil.cc


--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk

Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription

=== modified file 'linux/WulforUtil.cc'
--- linux/WulforUtil.cc	2011-04-15 06:24:54 +0000
+++ linux/WulforUtil.cc	2012-10-16 19:48:22 +0000
@@ -458,7 +458,8 @@
 {
 	// Holds a mapping of custom icon names -> stock icon names.
 	// Not all icons have stock representations.
-	map<string, string> icons;
+	// std::map used even with using namespace std. since net/if.h also defines map on Solaris.
+	std::map<string, string> icons;
 	icons["linuxdcpp"] = "linuxdcpp";
 	icons["linuxdcpp-dc++"] = "linuxdcpp-dc++";
 	icons["linuxdcpp-dc++-fw"] = "linuxdcpp-dc++-fw";
@@ -488,7 +489,8 @@
 
 	iconFactory = gtk_icon_factory_new();
 
-	for (map<string, string>::const_iterator i = icons.begin(); i != icons.end(); ++i)
+	// std::map used even with using namespace std. since net/if.h also defines map on Solaris.
+	for (std::map<string, string>::const_iterator i = icons.begin(); i != icons.end(); ++i)
 	{
 		string iconName = WGETI("use-system-icons") ? i->second : i->first;
 		GtkIconSource *iconSource = gtk_icon_source_new();