patches/wesnoth-10-fixstd.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1774 b1e01d497e70
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1774
b1e01d497e70 2009-03-22 Petr Sobotka <[email protected]>
sobi
parents: 1085
diff changeset
     1
--- wesnoth-1.5.3/src/variant.cpp.fixstd	2008-08-30 15:49:05.426701591 +0200
b1e01d497e70 2009-03-22 Petr Sobotka <[email protected]>
sobi
parents: 1085
diff changeset
     2
+++ wesnoth-1.5.3/src/variant.cpp	2008-08-30 15:49:22.372065298 +0200
b1e01d497e70 2009-03-22 Petr Sobotka <[email protected]>
sobi
parents: 1085
diff changeset
     3
@@ -529,7 +529,7 @@
1085
7eaac9b496cc 2008-05-04 Petr Sobotka <[email protected]>
sobi
parents:
diff changeset
     4
 
7eaac9b496cc 2008-05-04 Petr Sobotka <[email protected]>
sobi
parents:
diff changeset
     5
 variant variant::operator^(const variant& v) const
7eaac9b496cc 2008-05-04 Petr Sobotka <[email protected]>
sobi
parents:
diff changeset
     6
 {
1774
b1e01d497e70 2009-03-22 Petr Sobotka <[email protected]>
sobi
parents: 1085
diff changeset
     7
-	return variant(static_cast<int>(pow(static_cast<float>(as_int()), v.as_int())));
b1e01d497e70 2009-03-22 Petr Sobotka <[email protected]>
sobi
parents: 1085
diff changeset
     8
+	return variant(static_cast<int>(std::pow(static_cast<float>(as_int()), v.as_int())));
1085
7eaac9b496cc 2008-05-04 Petr Sobotka <[email protected]>
sobi
parents:
diff changeset
     9
 }
7eaac9b496cc 2008-05-04 Petr Sobotka <[email protected]>
sobi
parents:
diff changeset
    10
 
7eaac9b496cc 2008-05-04 Petr Sobotka <[email protected]>
sobi
parents:
diff changeset
    11
 variant variant::operator-() const