Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: src/animator/SkScriptTokenizer.cpp

Issue 12480002: Fixing some warnings on Linux (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/animator/SkAnimator.cpp ('k') | src/gpu/gl/GrGLShaderBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkScriptTokenizer.cpp
===================================================================
--- src/animator/SkScriptTokenizer.cpp (revision 8029)
+++ src/animator/SkScriptTokenizer.cpp (working copy)
@@ -603,8 +603,6 @@
}
if (ch == '.') {
if (fTokenLength == 0) {
- SkDEBUGCODE(SkScriptValue2 scriptValue;)
- SkDEBUGCODE(scriptValue.fOperand.fObject = NULL);
int tokenLength = token_length(++script);
const char* token = script;
script += tokenLength;
@@ -1273,6 +1271,7 @@
}
#ifdef SK_DEBUG
+#if defined(SK_SUPPORT_UNITTEST)
#define testInt(expression) { #expression, SkOperand2::kS32, expression, 0, NULL }
#ifdef SK_SCALAR_IS_FLOAT
@@ -1475,6 +1474,7 @@
};
#define SkScriptNAnswer_testCount SK_ARRAY_COUNT(scriptTests)
+#endif // SK_SUPPORT_UNITTEST
void SkScriptEngine2::UnitTest() {
#if defined(SK_SUPPORT_UNITTEST)
@@ -1506,6 +1506,7 @@
SkASSERT(0);
}
}
-#endif
+#endif // SK_SUPPORT_UNITTEST
}
-#endif
+#endif // SK_DEBUG
+
« no previous file with comments | « src/animator/SkAnimator.cpp ('k') | src/gpu/gl/GrGLShaderBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698