From patchwork Mon Feb 13 10:13:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 6767 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id F1A5E23ECA for ; Mon, 13 Feb 2012 10:31:37 +0000 (UTC) Received: from mail-tul01m020-f180.google.com (mail-tul01m020-f180.google.com [209.85.214.180]) by fiordland.canonical.com (Postfix) with ESMTP id B5A7DA1878D for ; Mon, 13 Feb 2012 10:31:37 +0000 (UTC) Received: by obbuo19 with SMTP id uo19so8645432obb.11 for ; Mon, 13 Feb 2012 02:31:37 -0800 (PST) Received: by 10.50.87.136 with SMTP id ay8mr8165150igb.25.1329129097030; Mon, 13 Feb 2012 02:31:37 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.66.135 with SMTP id n7cs51317ibi; Mon, 13 Feb 2012 02:31:36 -0800 (PST) Received: by 10.180.101.228 with SMTP id fj4mr12120882wib.4.1329129095580; Mon, 13 Feb 2012 02:31:35 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id u51si9484295wec.40.2012.02.13.02.31.35 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Feb 2012 02:31:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RwtC2-0000DU-EO for ; Mon, 13 Feb 2012 10:31:34 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id C72B1E169C for ; Mon, 13 Feb 2012 10:13:12 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 195 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 195: Android, Util: Fix build warnings. Message-Id: <20120213101312.17381.79453.launchpad@ackee.canonical.com> Date: Mon, 13 Feb 2012 10:13:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14781"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: db47442d1cbab11998c35def7f3ede6da7f1080b X-Gm-Message-State: ALoCoQn+g5srdDDxsoZhlTMYP8x4gZU3jd7JWItgyBp6tZJot1FvVFgZtM+VwgMwkRsIQ9/PcHXO ------------------------------------------------------------ revno: 195 committer: Alexandros Frantzis branch nick: trunk timestamp: Mon 2012-02-13 11:53:57 +0200 message: Android,Util: Fix build warnings. modified: src/android.cpp src/libmatrix/util.h --- lp:glmark2 https://code.launchpad.net/~glmark2-dev/glmark2/trunk You are subscribed to branch lp:glmark2. To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription === modified file 'src/android.cpp' --- src/android.cpp 2012-01-27 22:01:59 +0000 +++ src/android.cpp 2012-02-13 09:53:57 +0000 @@ -51,6 +51,8 @@ Java_org_linaro_glmark2_Glmark2Renderer_nativeInit(JNIEnv* env, jclass clazz, jobject asset_manager) { + static_cast(clazz); + Log::init("glmark2", false); Util::android_set_asset_manager(AAssetManager_fromJava(env, asset_manager)); @@ -82,6 +84,9 @@ jint w, jint h) { + static_cast(env); + static_cast(clazz); + Log::debug("Resizing to %d x %d\n", w, h); g_canvas->resize(w, h); } @@ -89,12 +94,15 @@ void Java_org_linaro_glmark2_Glmark2Renderer_nativeDone(JNIEnv* env) { + static_cast(env); + delete g_canvas; } jboolean Java_org_linaro_glmark2_Glmark2Renderer_nativeRender(JNIEnv* env) { + static_cast(env); static std::vector::iterator bench_iter = g_benchmarks.begin(); static Scene *scene = 0; static unsigned int score = 0; @@ -203,6 +211,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { + static_cast(reserved); JNIEnv* env = NULL; jint result = -1; === modified file 'src/libmatrix/util.h' --- src/libmatrix/util.h 2012-01-27 22:01:59 +0000 +++ src/libmatrix/util.h 2012-02-13 09:53:57 +0000 @@ -44,7 +44,7 @@ fromString(const std::string& asString) { std::stringstream ss(asString); - T retVal; + T retVal = T(); ss >> retVal; return retVal; }