From d9eb756cbfdd0f4388bb7bd203d8d43761ff7942 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Wed, 24 Aug 2016 19:29:15 +0300 Subject: Wrapping and attempt at LLVM 3.7 compat This commit includes manual merge conflict resolution changes from a rebase by @est31. --- src/libcore/num/wrapping.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/libcore') diff --git a/src/libcore/num/wrapping.rs b/src/libcore/num/wrapping.rs index 50d64838a5c..b3c2c25551e 100644 --- a/src/libcore/num/wrapping.rs +++ b/src/libcore/num/wrapping.rs @@ -298,6 +298,8 @@ macro_rules! wrapping_impl { } wrapping_impl! { usize u8 u16 u32 u64 isize i8 i16 i32 i64 } +#[cfg(not(stage0))] +wrapping_impl! { u128 i128 } mod shift_max { #![allow(non_upper_case_globals)] -- cgit 1.4.1-3-g733a5