diff options
| author | mitchell <unknown> | 2020-01-05 21:22:02 -0500 |
|---|---|---|
| committer | mitchell <unknown> | 2020-01-05 21:22:02 -0500 |
| commit | 60e87889d6438e386acf58c3967fb874af9aae82 (patch) | |
| tree | 9c5c2660c59aff04ddedea19fa03fd271f8bba5c /src/Decoration.cxx | |
| parent | dbb7374c185718655dd77c294eb281e8b93c538e (diff) | |
| download | scintilla-mirror-60e87889d6438e386acf58c3967fb874af9aae82.tar.gz | |
Added Sci::make_unique() and Sci::size() for better compatibility with the default branch.
std::make_unique() is c++14 and std::size() is c++17.
Diffstat (limited to 'src/Decoration.cxx')
| -rw-r--r-- | src/Decoration.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Decoration.cxx b/src/Decoration.cxx index 8d60d8935..813e988d0 100644 --- a/src/Decoration.cxx +++ b/src/Decoration.cxx @@ -143,7 +143,7 @@ Decoration<POS> *DecorationList<POS>::DecorationFromIndicator(int indicator) { template <typename POS> Decoration<POS> *DecorationList<POS>::Create(int indicator, Sci::Position length) { currentIndicator = indicator; - std::unique_ptr<Decoration<POS>> decoNew = std::unique_ptr<Decoration<POS>>(new Decoration<POS>(indicator)); + std::unique_ptr<Decoration<POS>> decoNew = Sci::make_unique<Decoration<POS>>(indicator); decoNew->rs.InsertSpace(0, static_cast<POS>(length)); typename std::vector<std::unique_ptr<Decoration<POS>>>::iterator it = std::lower_bound( @@ -300,16 +300,16 @@ namespace Scintilla { std::unique_ptr<IDecoration> DecorationCreate(bool largeDocument, int indicator) { if (largeDocument) - return std::unique_ptr<Decoration<Sci::Position>>(new Decoration<Sci::Position>(indicator)); + return Sci::make_unique<Decoration<Sci::Position>>(indicator); else - return std::unique_ptr<Decoration<int>>(new Decoration<int>(indicator)); + return Sci::make_unique<Decoration<int>>(indicator); } std::unique_ptr<IDecorationList> DecorationListCreate(bool largeDocument) { if (largeDocument) - return std::unique_ptr<DecorationList<Sci::Position>>(new DecorationList<Sci::Position>()); + return Sci::make_unique<DecorationList<Sci::Position>>(); else - return std::unique_ptr<DecorationList<int>>(new DecorationList<int>()); + return Sci::make_unique<DecorationList<int>>(); } } |
