diff options
| author | Miao Wang <miaowang@google.com> | 2017-03-06 13:45:08 -0800 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2017-03-07 16:30:11 -0800 |
| commit | 2b8756b6f1de65d3f8bffab45be6c44ceb7411fc (patch) | |
| tree | 0488797fc544fe977bec6418c73445759f052482 /Eigen/QtAlignedMalloc | |
| parent | 353bba589de58014a35f8f3666b7b96353c300f8 (diff) | |
| download | eigen-2b8756b6f1de65d3f8bffab45be6c44ceb7411fc.tar.gz | |
Rebase Eigen to 3.3.3.
Bug: 34161771
Test: mm and RenderScript BLAS tests pass on bullhead.
Change-Id: Ia448b3202708e395fed9c783ea4323289d69dbef
Diffstat (limited to 'Eigen/QtAlignedMalloc')
| -rw-r--r-- | Eigen/QtAlignedMalloc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Eigen/QtAlignedMalloc b/Eigen/QtAlignedMalloc index 46f7d83b7..c6571f129 100644 --- a/Eigen/QtAlignedMalloc +++ b/Eigen/QtAlignedMalloc @@ -1,3 +1,9 @@ +// This file is part of Eigen, a lightweight C++ template library +// for linear algebra. +// +// This Source Code Form is subject to the terms of the Mozilla +// Public License v. 2.0. If a copy of the MPL was not distributed +// with this file, You can obtain one at http://mozilla.org/MPL/2.0/. #ifndef EIGEN_QTMALLOC_MODULE_H #define EIGEN_QTMALLOC_MODULE_H @@ -8,7 +14,7 @@ #include "src/Core/util/DisableStupidWarnings.h" -void *qMalloc(size_t size) +void *qMalloc(std::size_t size) { return Eigen::internal::aligned_malloc(size); } @@ -18,7 +24,7 @@ void qFree(void *ptr) Eigen::internal::aligned_free(ptr); } -void *qRealloc(void *ptr, size_t size) +void *qRealloc(void *ptr, std::size_t size) { void* newPtr = Eigen::internal::aligned_malloc(size); memcpy(newPtr, ptr, size); |