Switch minikin to std::unique_ptr.

Bug: http://b/22403888
Change-Id: I9e18496fcc38ad2e6b922455daa9f2a46778ec55
This commit is contained in:
Elliott Hughes
2016-09-11 14:47:29 -07:00
parent 58514b3cce
commit fba88d3b3c
3 changed files with 6 additions and 5 deletions

View File

@@ -19,7 +19,8 @@
#include <stdint.h>
#include <sys/types.h>
#include <UniquePtr.h>
#include <memory>
// ---------------------------------------------------------------------------
@@ -79,8 +80,8 @@ private:
static int CountLeadingZeros(element x);
uint32_t mMaxVal;
UniquePtr<uint32_t[]> mIndices;
UniquePtr<element[]> mBitmaps;
std::unique_ptr<uint32_t[]> mIndices;
std::unique_ptr<element[]> mBitmaps;
uint32_t mZeroPageIndex;
};

View File

@@ -34,7 +34,6 @@
#include <minikin/AnalyzeStyle.h>
#include <minikin/CmapCoverage.h>
#include <minikin/FontFamily.h>
#include <UniquePtr.h>
using std::vector;

View File

@@ -496,7 +496,8 @@ private:
size_t mRunCount;
bool mIsRtl;
DISALLOW_COPY_AND_ASSIGN(BidiText);
BidiText(const BidiText&) = delete;
void operator=(const BidiText&) = delete;
};
BidiText::Iter::Iter(UBiDi* bidi, size_t start, size_t end, size_t runIndex, size_t runCount,