Merge.
authorNicholas Hastings <skamonkey@gmail.com>
Sat Sep 01 00:09:46 2012 -0400 (2012-09-01)
changeset 3641edefa533ea00
parent 3640 d11a9edd1cb5
parent 3639 93afd6413ce1
child 3642 e7b2bd41f7fa
Merge.
     1.1 --- a/core/logic/smn_profiler.cpp	Sat Sep 01 00:09:19 2012 -0400
     1.2 +++ b/core/logic/smn_profiler.cpp	Sat Sep 01 00:09:46 2012 -0400
     1.3 @@ -179,7 +179,7 @@
     1.4  #else
     1.5  	int64_t start_us = int64_t(prof->start.tv_sec) * 1000000 + prof->start.tv_usec;
     1.6  	int64_t stop_us = int64_t(prof->end.tv_sec) * 1000000 + prof->end.tv_usec;
     1.7 -	fTime = double((stop_us - start_us) / 1000) / 1000.0;
     1.8 +	fTime = double(stop_us - start_us) / 1000000.0;
     1.9  #endif
    1.10  
    1.11  	return sp_ftoc(fTime);