diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-05-15 08:47:44 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-05-15 08:47:44 +1000 |
| commit | 2c660b3e47671db7cfe0eff1ea71c337eb4cc34a (patch) | |
| tree | 86674de667e29b426f61077cf02c3e07b17c7c09 /win32 | |
| parent | 709018ec442d0136f081211ad87a75ca7fb71036 (diff) | |
| download | scintilla-mirror-2c660b3e47671db7cfe0eff1ea71c337eb4cc34a.tar.gz | |
Replace ELEMENTS with std::size and drop inclusion of StringCopy.h.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/PlatWin.cxx | 1 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 68fb3f05b..b4fa77250 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -44,7 +44,6 @@ #endif #include "Platform.h" -#include "StringCopy.h" #include "XPM.h" #include "UniConversion.h" #include "DBCS.h" diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 909964797..d60e2b31c 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -53,7 +53,6 @@ #ifdef SCI_LEXER #include "SciLexer.h" #endif -#include "StringCopy.h" #ifdef SCI_LEXER #include "LexerModule.h" #endif @@ -2544,10 +2543,10 @@ STDMETHODIMP DataObject_EnumFormatEtc(DataObject *pd, DWORD dwDirection, IEnumFO FormatEnumerator *pfe; if (pd->sci->IsUnicodeMode()) { CLIPFORMAT formats[] = {CF_UNICODETEXT, CF_TEXT}; - pfe = new FormatEnumerator(0, formats, ELEMENTS(formats)); + pfe = new FormatEnumerator(0, formats, std::size(formats)); } else { CLIPFORMAT formats[] = {CF_TEXT}; - pfe = new FormatEnumerator(0, formats, ELEMENTS(formats)); + pfe = new FormatEnumerator(0, formats, std::size(formats)); } return FormatEnumerator_QueryInterface(pfe, IID_IEnumFORMATETC, reinterpret_cast<void **>(ppEnum)); |