Author: mordante
Date: Fri Oct 14 21:33:25 2011
New Revision: 51479
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51479&view=rev
Log:
Remove a no longer needed work-around for g++-4.7.
The current snapshot of 4.7 compiles fine without the work-around.
Modified:
trunk/src/variable.hpp
Modified: trunk/src/variable.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/variable.hpp?rev=51479&r1=51478&r2=51479&view=diff
==============================================================================
--- trunk/src/variable.hpp (original)
+++ trunk/src/variable.hpp Fri Oct 14 21:33:25 2011
@@ -38,7 +38,7 @@
* missing default constructor for vconfig. Not entirely sure whether it's a
* bug in gcc or not. For now make the code conditional.
*/
-#if __GNUC__ == 4 && (__GNUC_MINOR__ == 6 || __GNUC_MINOR__ == 7) &&
defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if __GNUC__ == 4 && __GNUC_MINOR__ == 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
template<class T1, class T2>
friend class std::pair;
#endif
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
