diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
| commit | 6568b0624dcd03243c70f9aa905b88422cb1e4c2 (patch) | |
| tree | 48ec6babfbfb2f9d255df568b659db9541d11054 /dep/acelite/ace/Basic_Stats.cpp | |
| parent | e3add09fb7f8f3c425f6cb0e7611e4e2381bf88d (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
Diffstat (limited to 'dep/acelite/ace/Basic_Stats.cpp')
| -rw-r--r-- | dep/acelite/ace/Basic_Stats.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dep/acelite/ace/Basic_Stats.cpp b/dep/acelite/ace/Basic_Stats.cpp index ae663abe221..93c4c0bdde8 100644 --- a/dep/acelite/ace/Basic_Stats.cpp +++ b/dep/acelite/ace/Basic_Stats.cpp @@ -1,4 +1,4 @@ -// $Id: Basic_Stats.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Basic_Stats.cpp 95743 2012-05-13 12:29:28Z johnnyw $ #include "ace/Basic_Stats.h" #include "ace/Log_Msg.h" @@ -42,7 +42,9 @@ ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs) } void -ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, ACE_UINT32 sf) const +ACE_Basic_Stats::dump_results ( + const ACE_TCHAR *msg, + ACE_Basic_Stats::scale_factor_type sf) const { #ifndef ACE_NLOGGING if (this->samples_count () == 0u) |