diff options
| author |  bungeman <bungeman@google.com> | 2016-04-21 10:52:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-21 10:52:03 -0700 |
| commit | 6a6f3c58b4289544f9aab58036579f7caa0b7cd5 (patch) | |
| tree | 8b9111e32c57f3c9e1d6e150717ddac20fe60032 | |
| parent | eb85fd746d6390f53e250583a0544bf59ed34b35 (diff) | |
Fix indentation and casts in SkTArray.
Review URL: https://codereview.chromium.org/1902423007
| -rw-r--r-- | include/private/SkTArray.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/private/SkTArray.h b/include/private/SkTArray.h index 8d8f6598db..55d4f86aaa 100644 --- a/include/private/SkTArray.h +++ b/include/private/SkTArray.h @@ -194,11 +194,11 @@ public: */ T* push_back_n(int n) { SkASSERT(n >= 0); - char* newTs = static_cast<char*>(this->push_back_raw(n)); + void* newTs = this->push_back_raw(n); for (int i = 0; i < n; ++i) { - new (newTs + i * sizeof(T)) T; + new (static_cast<char*>(newTs) + i * sizeof(T)) T; } - return reinterpret_cast<T*>(newTs); + return static_cast<T*>(newTs); } /** @@ -207,11 +207,11 @@ public: */ T* push_back_n(int n, const T& t) { SkASSERT(n >= 0); - char* newTs = static_cast<char*>(this->push_back_raw(n)); + void* newTs = this->push_back_raw(n); for (int i = 0; i < n; ++i) { - new (newTs + i * sizeof(T)) T(t); + new (static_cast<char*>(newTs) + i * sizeof(T)) T(t); } - return reinterpret_cast<T*>(newTs); + return static_cast<T*>(newTs); } /** |