From 02759d75bdf238551134dfdda095e3ffcf319a25 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Sun, 15 Dec 2013 21:04:00 -0800 Subject: fix build. Fix the following compiler error on the sdk build: cc1plus: warnings being treated as errors frameworks/rs/rsScript.cpp: In member function 'void android::renderscript::Script::getVar(uint32_t, const void*, size_t)': frameworks/rs/rsScript.cpp:68: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t' frameworks/rs/rsScript.cpp: In member function 'void android::renderscript::Script::setVar(uint32_t, const void*, size_t, android::renderscript::Element*, const size_t*, size_t)': frameworks/rs/rsScript.cpp:78: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t' frameworks/rs/rsScript.cpp: In member function 'void android::renderscript::Script::setVarObj(uint32_t, android::renderscript::ObjectBase*)': frameworks/rs/rsScript.cpp:89: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t' make: *** [out/host/darwin-x86/obj/STATIC_LIBRARIES/libRS_intermediates/rsScript.o] Error 1 make: *** Waiting for unfinished jobs.... Change-Id: Ibeb858c24bff95ef3960073aba108f1dc92a5ac4 --- rsScript.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rsScript.cpp') diff --git a/rsScript.cpp b/rsScript.cpp index a4a4e3ba..835ded1a 100644 --- a/rsScript.cpp +++ b/rsScript.cpp @@ -66,7 +66,7 @@ void Script::getVar(uint32_t slot, const void *val, size_t len) { //ALOGE("getVar %i %p %i", slot, val, len); if (slot >= mHal.info.exportedVariableCount) { ALOGE("Script::getVar unable to set allocation, invalid slot index: " - "%u >= %u", slot, mHal.info.exportedVariableCount); + "%u >= %zu", slot, mHal.info.exportedVariableCount); return; } mRSC->mHal.funcs.script.getGlobalVar(mRSC, this, slot, (void *)val, len); @@ -76,7 +76,7 @@ void Script::setVar(uint32_t slot, const void *val, size_t len, Element *e, const size_t *dims, size_t dimLen) { if (slot >= mHal.info.exportedVariableCount) { ALOGE("Script::setVar unable to set allocation, invalid slot index: " - "%u >= %u", slot, mHal.info.exportedVariableCount); + "%u >= %zu", slot, mHal.info.exportedVariableCount); return; } mRSC->mHal.funcs.script.setGlobalVarWithElemDims(mRSC, this, slot, @@ -87,7 +87,7 @@ void Script::setVarObj(uint32_t slot, ObjectBase *val) { //ALOGE("setVarObj %i %p", slot, val); if (slot >= mHal.info.exportedVariableCount) { ALOGE("Script::setVarObj unable to set allocation, invalid slot index: " - "%u >= %u", slot, mHal.info.exportedVariableCount); + "%u >= %zu", slot, mHal.info.exportedVariableCount); return; } mHasObjectSlots = true; -- cgit v1.2.3