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 /src | |
| parent | 709018ec442d0136f081211ad87a75ca7fb71036 (diff) | |
| download | scintilla-mirror-2c660b3e47671db7cfe0eff1ea71c337eb4cc34a.tar.gz | |
Replace ELEMENTS with std::size and drop inclusion of StringCopy.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CallTip.cxx | 1 | ||||
| -rw-r--r-- | src/EditModel.cxx | 1 | ||||
| -rw-r--r-- | src/EditView.cxx | 1 | ||||
| -rw-r--r-- | src/Editor.cxx | 3 | ||||
| -rw-r--r-- | src/MarginView.cxx | 1 |
5 files changed, 1 insertions, 6 deletions
diff --git a/src/CallTip.cxx b/src/CallTip.cxx index 437933af9..e38709624 100644 --- a/src/CallTip.cxx +++ b/src/CallTip.cxx @@ -21,7 +21,6 @@ #include "Scintilla.h" -#include "StringCopy.h" #include "Position.h" #include "IntegerRectangle.h" #include "CallTip.h" diff --git a/src/EditModel.cxx b/src/EditModel.cxx index c4c78fe02..fcca51405 100644 --- a/src/EditModel.cxx +++ b/src/EditModel.cxx @@ -25,7 +25,6 @@ #include "ILexer.h" #include "Scintilla.h" -#include "StringCopy.h" #include "Position.h" #include "UniqueString.h" #include "SplitVector.h" diff --git a/src/EditView.cxx b/src/EditView.cxx index b406747fb..6ca22e4f2 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -30,7 +30,6 @@ #include "ILexer.h" #include "Scintilla.h" -#include "StringCopy.h" #include "CharacterSet.h" #include "Position.h" #include "IntegerRectangle.h" diff --git a/src/Editor.cxx b/src/Editor.cxx index 7a61d503a..9aba5ccd2 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -29,7 +29,6 @@ #include "ILexer.h" #include "Scintilla.h" -#include "StringCopy.h" #include "CharacterSet.h" #include "Position.h" #include "UniqueString.h" @@ -1957,7 +1956,7 @@ void Editor::AddCharUTF(const char *s, unsigned int len, bool treatAsDBCS) { // characters representing themselves. } else { unsigned int utf32[1] = { 0 }; - UTF32FromUTF8(std::string_view(s, len), utf32, ELEMENTS(utf32)); + UTF32FromUTF8(std::string_view(s, len), utf32, std::size(utf32)); byte = utf32[0]; } NotifyChar(byte); diff --git a/src/MarginView.cxx b/src/MarginView.cxx index 6604657f6..0b52056d4 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -27,7 +27,6 @@ #include "ILexer.h" #include "Scintilla.h" -#include "StringCopy.h" #include "Position.h" #include "IntegerRectangle.h" #include "UniqueString.h" |