aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-31 00:00:56 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-31 00:00:56 +0000
commitf2776ee02a322e045c369b57a5d25aca73447b78 (patch)
treef2d604744dfbe8faaaa6010da0a83400f7adb2ea /include
parent46724e457e9df0dd4fbafca4746621a42bd37ac3 (diff)
Alter assert that is causing Chromium compilation failure
../../third_party/skia/include/core/SkTypeface.h:303:19: error: implicit conversion turns string literal into bool: 'const char [14]' to 'bool' [-Werror,-Wstring-conversion] SkASSERT(!"unimplemented"); ~^~~~~~~~~~~~~~~ git-svn-id: http://skia.googlecode.com/svn/trunk@10447 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/core/SkTypeface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index fccbe1f62e..44abdd3b3a 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -300,7 +300,7 @@ protected:
// TODO: make this pure-virtual when all ports have overridden it
virtual SkTypeface* onRefMatchingStyle(Style styleBits) const {
- SkASSERT(!"unimplemented");
+ SkASSERT(0);
this->ref();
return const_cast<SkTypeface*>(this);
}