commit e926ff70839ae10e78525a021a0c79c9d080cb35
author Tim Murray <timmurray@google.com> Wed Feb 26 21:30:46 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 26 21:30:46 2014 +0000
tree 0df0185160d85fc33fba109019ac413a52a6312a
parent 5158f4b3e144b8279f0a28c88078340c1f0b736a
parent a47447424853775e6ebc5d20680388eeb37b1f77

Merge "Fix build break."

rsAllocation.cpp

diff --git a/rsAllocation.cpp b/rsAllocation.cpp
index fd0a49c..3fbbfff 100644
--- a/rsAllocation.cpp
+++ b/rsAllocation.cpp
@@ -738,7 +738,7 @@
                           uint32_t lod, RsAllocationCubemapFace face,
                           uint32_t z, uint32_t array, size_t *stride, size_t strideLen) {
     Allocation *alloc = static_cast<Allocation *>(valloc);
-    assert(strideLen == sizeof(size_t));
+    rsAssert(strideLen == sizeof(size_t));
 
     alloc->getPointer(rsc, lod, face, z, array, stride);
 }