From 60e87889d6438e386acf58c3967fb874af9aae82 Mon Sep 17 00:00:00 2001 From: mitchell Date: Sun, 5 Jan 2020 21:22:02 -0500 Subject: 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. --- src/CallTip.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/CallTip.cxx') diff --git a/src/CallTip.cxx b/src/CallTip.cxx index 18c4549bb..db66878ce 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" @@ -135,14 +134,14 @@ void CallTip::DrawChunk(Surface *surface, int &x, const char *s, Point::FromInts(centreX + halfWidth, centreY + quarterWidth), Point::FromInts(centreX, centreY - halfWidth + quarterWidth), }; - surface->Polygon(pts, ELEMENTS(pts), colourBG, colourBG); + surface->Polygon(pts, Sci::size(pts), colourBG, colourBG); } else { // Down arrow Point pts[] = { Point::FromInts(centreX - halfWidth, centreY - quarterWidth), Point::FromInts(centreX + halfWidth, centreY - quarterWidth), Point::FromInts(centreX, centreY + halfWidth - quarterWidth), }; - surface->Polygon(pts, ELEMENTS(pts), colourBG, colourBG); + surface->Polygon(pts, Sci::size(pts), colourBG, colourBG); } } offsetMain = xEnd; -- cgit v1.2.3