From patchwork Wed May 16 13:18:09 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: 8690 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 F047F23EB5 for ; Wed, 16 May 2012 13:18:12 +0000 (UTC) Received: from mail-qa0-f45.google.com (mail-qa0-f45.google.com [209.85.216.45]) by fiordland.canonical.com (Postfix) with ESMTP id C2A13A1828F for ; Wed, 16 May 2012 13:18:12 +0000 (UTC) Received: by mail-qa0-f45.google.com with SMTP id b19so5258130qae.11 for ; Wed, 16 May 2012 06:18:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=RqGg0IoN4Id/LEtI8LNXgNXsnHvh+cCuDkZjWMSK3TM=; b=m4VwEXVe8Eet+T0sZ6iFI0efx4XBHBmAJj61nfJOsc3iWeDMBNdrPjbmZYHhv5vu2V rEB/4cZnRcMZfMDs9qM+wecGiGi39uWHsVn81wSdBw9Nkv/031rGvjBC4dHjjPIg89Ga 9x/Q9JebDrqbbPr4QSQJ1bDWSRx+0RGhXNY3+lT/ToKp2KDf1LBZ942gNSrvi1qpteAQ QssSsrPTHEF3aDCxeHobDbUVLSLhoH0J64E7cV5vnvNB/d5rUi7wPDgHTqCg5F5sWvK6 gBVnqnTovbxN1vvIhQobWXYeVZJ7VOc8+NclfP+fnpizN4lNbC0mrKD+S6R9ZKeDGWJX ZjyA== Received: by 10.50.222.202 with SMTP id qo10mr10157412igc.0.1337174292162; Wed, 16 May 2012 06:18:12 -0700 (PDT) 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.35.72 with SMTP id o8csp492705ibd; Wed, 16 May 2012 06:18:11 -0700 (PDT) Received: by 10.180.81.36 with SMTP id w4mr7931179wix.16.1337174290661; Wed, 16 May 2012 06:18:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id m21si3061208wee.82.2012.05.16.06.18.09 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 May 2012 06:18:10 -0700 (PDT) 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 1SUe7F-0006wu-MU for ; Wed, 16 May 2012 13:18:09 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 9A7D1E5359 for ; Wed, 16 May 2012 13:18:09 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glcompbench X-Launchpad-Branch: ~glcompbench-dev/glcompbench/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 84 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glcompbench-dev/glcompbench/trunk] Rev 84: Remove spurious 'using namespace std'. Message-Id: <20120516131809.812.18992.launchpad@ackee.canonical.com> Date: Wed, 16 May 2012 13:18:09 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15247"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 562c6615a2467c82c6a7bc907374e84a81d012c0 X-Gm-Message-State: ALoCoQkTuTdPmcplQ6H0WSFN3SMZ2Evocj0aZ0klJ/HUZninVG5eFTopDTIMVF8r/8SGw6sTM+xO ------------------------------------------------------------ revno: 84 committer: Alexandros Frantzis branch nick: trunk timestamp: Wed 2012-05-16 16:14:53 +0300 message: Remove spurious 'using namespace std'. modified: src/composite-test-simple-blur.cc src/glcompbench.cc src/profiler.h --- lp:glcompbench https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk You are subscribed to branch lp:glcompbench. To unsubscribe from this branch go to https://code.launchpad.net/~glcompbench-dev/glcompbench/trunk/+edit-subscription === modified file 'src/composite-test-simple-blur.cc' --- src/composite-test-simple-blur.cc 2012-03-23 21:04:23 +0000 +++ src/composite-test-simple-blur.cc 2012-05-16 13:14:53 +0000 @@ -35,6 +35,7 @@ using std::string; using std::map; using std::list; +using std::pair; using LibMatrix::vec2; // @@ -415,7 +416,7 @@ screen_size.y() * (0.5 + 0.25 * sin(i * angular_step))); ro->position(center - corner_offset); ro->resize(window_size); - priv_->windowMap.insert(make_pair(win->get_xwindow(), ro)); + priv_->windowMap.insert(std::make_pair(win->get_xwindow(), ro)); i++; } // @@ -471,7 +472,7 @@ RenderWindowBlur* ro = new RenderWindowBlur(priv_->passes, priv_->radius, priv_->separable); ro->init(program_); pair retState = - priv_->windowMap.insert(make_pair(cw->get_xwindow(), ro)); + priv_->windowMap.insert(std::make_pair(cw->get_xwindow(), ro)); if (!retState.second) { // Map insertion failed. This shouldn't happen, but we need to === modified file 'src/glcompbench.cc' --- src/glcompbench.cc 2012-03-20 16:32:54 +0000 +++ src/glcompbench.cc 2012-05-16 13:14:53 +0000 @@ -55,9 +55,9 @@ static void list_tests() { - const map &tests = Benchmark::tests(); + const std::map &tests = Benchmark::tests(); - for (map::const_iterator test_iter = tests.begin(); + for (std::map::const_iterator test_iter = tests.begin(); test_iter != tests.end(); test_iter++) { @@ -67,9 +67,9 @@ Log::info("[Test] %s\n", test->name().c_str()); - const map &options = test->options(); + const std::map &options = test->options(); - for (map::const_iterator opt_iter = options.begin(); + for (std::map::const_iterator opt_iter = options.begin(); opt_iter != options.end(); opt_iter++) { @@ -94,7 +94,7 @@ static void add_custom_benchmarks(std::list &benchmarks) { - for (std::list::const_iterator iter = Options::benchmarks.begin(); + for (std::list::const_iterator iter = Options::benchmarks.begin(); iter != Options::benchmarks.end(); iter++) { @@ -106,9 +106,9 @@ void assign_canvas_to_tests(std::list &canvas_list) { - const map &tests = Benchmark::tests(); + const std::map &tests = Benchmark::tests(); - for (map::const_iterator test_iter = tests.begin(); + for (std::map::const_iterator test_iter = tests.begin(); test_iter != tests.end(); test_iter++) === modified file 'src/profiler.h' --- src/profiler.h 2011-10-14 12:41:30 +0000 +++ src/profiler.h 2012-05-16 13:14:53 +0000 @@ -28,8 +28,6 @@ #include #include -using namespace std; - struct ProfilerPoint; class Profiler