aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
authormitchell <unknown>2018-05-06 21:22:30 -0400
committermitchell <unknown>2018-05-06 21:22:30 -0400
commit724309f4b71d1d991a754d0ad821de3861b6a211 (patch)
treef24a11e3c550ad8ba46b92089a2ef1d3aff34663 /win32/ScintillaWin.cxx
parent8971ac9fe89f01e717ad21126213ac8887fe373d (diff)
downloadscintilla-mirror-724309f4b71d1d991a754d0ad821de3861b6a211.tar.gz
Backport: Use <chrono> for platform-independent timing and remove ElapsedTime. Also use #if for painting measurement as there are 7 sections of code to enable.
Backport of changeset 6741:af5d9064c25c.
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 21a9cced4..2cdec07d7 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -21,6 +21,7 @@
#include <map>
#include <algorithm>
#include <memory>
+#include <chrono>
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0500
@@ -80,6 +81,7 @@
#include "MarginView.h"
#include "EditView.h"
#include "Editor.h"
+#include "ElapsedPeriod.h"
#include "AutoComplete.h"
#include "ScintillaBase.h"
@@ -813,7 +815,7 @@ void ScintillaWin::AddCharUTF16(wchar_t const *wcs, unsigned int wclen) {
}
sptr_t ScintillaWin::WndPaint(uptr_t wParam) {
- //ElapsedTime et;
+ //ElapsedPeriod ep;
// Redirect assertions to debug output and save current state
const bool assertsPopup = Platform::ShowAssertionPopUps(false);
@@ -878,7 +880,7 @@ sptr_t ScintillaWin::WndPaint(uptr_t wParam) {
// Restore debug output state
Platform::ShowAssertionPopUps(assertsPopup);
- //Platform::DebugPrintf("Paint took %g\n", et.Duration());
+ //Platform::DebugPrintf("Paint took %g\n", ep.Duration());
return 0l;
}