Merge.
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);