diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Timeprobe_T.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Timeprobe_T.cpp')
| -rw-r--r-- | dep/acelite/ace/Timeprobe_T.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dep/acelite/ace/Timeprobe_T.cpp b/dep/acelite/ace/Timeprobe_T.cpp index d23b7b8b869..f440c7edab0 100644 --- a/dep/acelite/ace/Timeprobe_T.cpp +++ b/dep/acelite/ace/Timeprobe_T.cpp @@ -1,4 +1,4 @@ -// $Id: Timeprobe_T.cpp 80826 2008-03-04 14:51:23Z wotte $ +// $Id: Timeprobe_T.cpp 95743 2012-05-13 12:29:28Z johnnyw $ #ifndef ACE_TIMEPROBE_T_CPP #define ACE_TIMEPROBE_T_CPP @@ -250,7 +250,8 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void) "thread", "usec")); - double gsf = ACE_High_Res_Timer::global_scale_factor (); + ACE_High_Res_Timer::global_scale_factor_type gsf = + ACE_High_Res_Timer::global_scale_factor (); u_long i, j; // First element |