aboutsummaryrefslogtreecommitdiff
path: root/lib/std/math/log.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-12-10 11:13:39 -0500
committerAndrew Kelley <andrew@ziglang.org>2019-12-10 11:13:39 -0500
commit9561e7c6b9fb2d9ebcbfd611196db698372ae7bd (patch)
tree6b4fd0751e80a9c4128756d59d3c0bfecd230498 /lib/std/math/log.zig
parentcd4d638d10365e47bcb371119dcee22581355ac4 (diff)
parent30715560c829d5636734edf7eabff3ee4d170e5d (diff)
downloadzig-9561e7c6b9fb2d9ebcbfd611196db698372ae7bd.tar.gz
zig-9561e7c6b9fb2d9ebcbfd611196db698372ae7bd.zip
Merge branch 'Snektron-typeOf-to-TypeOf'
closes #3875 closes #1348
Diffstat (limited to 'lib/std/math/log.zig')
-rw-r--r--lib/std/math/log.zig4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/math/log.zig b/lib/std/math/log.zig
index 40b716b005..1302b564b6 100644
--- a/lib/std/math/log.zig
+++ b/lib/std/math/log.zig
@@ -23,10 +23,10 @@ pub fn log(comptime T: type, base: T, x: T) T {
const float_base = math.lossyCast(f64, base);
switch (@typeId(T)) {
TypeId.ComptimeFloat => {
- return @typeOf(1.0)(math.ln(@as(f64, x)) / math.ln(float_base));
+ return @TypeOf(1.0)(math.ln(@as(f64, x)) / math.ln(float_base));
},
TypeId.ComptimeInt => {
- return @typeOf(1)(math.floor(math.ln(@as(f64, x)) / math.ln(float_base)));
+ return @TypeOf(1)(math.floor(math.ln(@as(f64, x)) / math.ln(float_base)));
},
builtin.TypeId.Int => {
// TODO implement integer log without using float math