From: <tz...@us...> - 2006-02-03 22:50:08
|
Revision: 1725 Author: tzlaine Date: 2006-02-03 14:49:44 -0800 (Fri, 03 Feb 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1725&view=rev Log Message: ----------- Removed the hack required to get Condition.cpp and ResourceCenter.cpp to compile with previous versions of MSVC, since it breaks the build when using the latest version. Modified Paths: -------------- trunk/FreeOrion/universe/Condition.cpp trunk/FreeOrion/universe/ResourceCenter.cpp Modified: trunk/FreeOrion/universe/Condition.cpp =================================================================== --- trunk/FreeOrion/universe/Condition.cpp 2006-02-03 04:57:39 UTC (rev 1724) +++ trunk/FreeOrion/universe/Condition.cpp 2006-02-03 22:49:44 UTC (rev 1725) @@ -13,14 +13,6 @@ using boost::lexical_cast; using boost::format; -#if defined(WIN32) && defined(_MSC_VER) -#ifdef _DEBUG -// Fix for evil M$ compile bug: fatal error C1055: compiler limit : out of keys -#undef assert -#define assert(exp) (void)( (exp) || (_assert(#exp, __FILE__, -1), 0) ) -#endif -#endif - namespace { Condition::ConditionBase* NewAll(const XMLElement& elem) {return new Condition::All(elem);} Condition::ConditionBase* NewEmpireAffiliation(const XMLElement& elem) {return new Condition::EmpireAffiliation(elem);} Modified: trunk/FreeOrion/universe/ResourceCenter.cpp =================================================================== --- trunk/FreeOrion/universe/ResourceCenter.cpp 2006-02-03 04:57:39 UTC (rev 1724) +++ trunk/FreeOrion/universe/ResourceCenter.cpp 2006-02-03 22:49:44 UTC (rev 1725) @@ -18,14 +18,6 @@ using boost::lexical_cast; -#if defined(WIN32) && defined(_MSC_VER) -#ifdef _DEBUG -// Fix for evil M$ compile bug: fatal error C1055: compiler limit : out of keys -#undef assert -#define assert(exp) (void)( (exp) || (_assert(#exp, __FILE__, -1), 0) ) -#endif -#endif - namespace { DataTableMap& ProductionDataTables() { |