[Widelands-cvs] SF.net SVN: widelands:[5024] trunk/src/logic/world.cc

[<si...@us...>]

Revision: 5024
          http://widelands.svn.sourceforge.net/widelands/?rev=5024&view=rev
Author:   sirver
Date:     2010-01-30 18:15:54 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
libstd++ does not define std::map::at

This is a workaround that is (for example) needed for OS X 10.5.

Modified Paths:
--------------
    trunk/src/logic/world.cc

Modified: trunk/src/logic/world.cc
===================================================================
--- trunk/src/logic/world.cc	2010-01-30 18:15:31 UTC (rev 5023)
+++ trunk/src/logic/world.cc	2010-01-30 18:15:54 UTC (rev 5024)
@@ -397,7 +397,9 @@
 {
 	if (m_BobKinds.find(bobKindName) == m_BobKinds.end())
 		throw wexception("invalid MapGenBobKind %s", bobKindName.c_str());
-	return & m_BobKinds.at(bobKindName);
+	// Ugly workaround because at is not defined for some systems
+	// and operator[] does not fare well with constants
+	return & m_BobKinds.find(bobKindName)->second;
 }
 
 void MapGenInfo::parseProfile(World * const world, Profile & profile)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.