From d1b8d5eeb230a0c4ee480c0d7d36a6663c73f3fd Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 13 Mar 2016 19:42:30 -0700 Subject: 2771 - fix for clang on 32-bit machines Turns out that LLVM/Clang still doesn't support multiplying 64-bit numbers on a 32-bit platform. https://llvm.org/bugs/show_bug.cgi?id=14469 This is just a quick fix, because it turns out I don't have any integer multiplication anywhere else. In the long run I think I'm going to just drop 'long long int' in favor of 'int'. Overflow is less likely than this configuration on somebody's machine. --- 082scenario_screen.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '082scenario_screen.cc') diff --git a/082scenario_screen.cc b/082scenario_screen.cc index 579d9b9a..560d0079 100644 --- a/082scenario_screen.cc +++ b/082scenario_screen.cc @@ -341,9 +341,9 @@ void dump_screen() { assert(!current_call().default_space); // not supported long long int screen_location = get_or_insert(Memory, SCREEN) + /*skip refcount*/1; int width_offset = find_element_name(get(Type_ordinal, "screen"), "num-columns", ""); - long long int screen_width = get_or_insert(Memory, screen_location+width_offset); + int screen_width = get_or_insert(Memory, screen_location+width_offset); int height_offset = find_element_name(get(Type_ordinal, "screen"), "num-rows", ""); - long long int screen_height = get_or_insert(Memory, screen_location+height_offset); + int screen_height = get_or_insert(Memory, screen_location+height_offset); int data_offset = find_element_name(get(Type_ordinal, "screen"), "data", ""); assert(data_offset >= 0); long long int screen_data_location = screen_location+data_offset; // type: address:shared:array:character -- cgit 1.4.1-2-gfad0