diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h index a8d5e48aa6..b5ecdc98b1 100644 --- a/include/core/SkTArray.h +++ b/include/core/SkTArray.h @@ -456,7 +456,7 @@ void* operator new(size_t, SkTArray* array, int atIndex) { // Skia doesn't use C++ exceptions but it may be compiled with them enabled. Having an op delete // to match the op new silences warnings about missing op delete when a constructor throws an // exception. -template +template void operator delete(void*, SkTArray* array, int atIndex) { SK_CRASH(); } diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp index e4fa38e974..d18585414c 100644 --- a/samplecode/TransitionView.cpp +++ b/samplecode/TransitionView.cpp @@ -86,7 +86,7 @@ protected: //attach the new fPrev and call unref to balance the ref in onDraw this->attachChildToBack(fPrev)->unref(); this->inval(NULL); - + SkASSERT(1 == prev->getRefCnt()); prev->unref(); return true;