From 2c660b3e47671db7cfe0eff1ea71c337eb4cc34a Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 15 May 2018 08:47:44 +1000 Subject: Replace ELEMENTS with std::size and drop inclusion of StringCopy.h. --- win32/PlatWin.cxx | 1 - win32/ScintillaWin.cxx | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'win32') 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(ppEnum)); -- cgit v1.2.3