From 108ef182aae36252a8d37ddf443d05156b6161e5 Mon Sep 17 00:00:00 2001 From: Chuck Date: Fri, 30 May 2014 15:52:17 +0200 Subject: try is a keyword in c++ --- src/process_hkl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/process_hkl.c b/src/process_hkl.c index e3ae1302..2497215a 100644 --- a/src/process_hkl.c +++ b/src/process_hkl.c @@ -11,6 +11,7 @@ * 2009-2014 Thomas White * 2011 Andrew Martin * 2012 Lorenzo Galli + * 2014 Chunhong Yoon * * This file is part of CrystFEL. * @@ -182,18 +183,18 @@ static double scale_intensities(RefList *reference, RefList *new, static double *check_hist_size(int n, double *hist_vals) { int ns; - double *try; + double *tryMe; if ( n % 1000 ) return hist_vals; ns = n / 1000; ns = (ns+1)*1000; - try = realloc(hist_vals, ns*sizeof(double)); - if ( try == NULL ) { + tryMe = realloc(hist_vals, ns*sizeof(double)); + if ( tryMe == NULL ) { ERROR("Failed to allocate space for histogram.\n"); } - return try; + return tryMe; } -- cgit v1.2.3