diff mbox

[Branch,~glcompbench-dev/glcompbench/trunk] Rev 84: Remove spurious 'using namespace std'.

Message ID 20120516131809.812.18992.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org May 16, 2012, 1:18 p.m. UTC 
------------------------------------------------------------
revno: 84
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
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
diff mbox

Patch

=== 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<BlurWindowMapType::iterator, bool> 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<string, CompositeTest *> &tests = Benchmark::tests();
+    const std::map<std::string, CompositeTest *> &tests = Benchmark::tests();
 
-    for (map<string, CompositeTest *>::const_iterator test_iter = tests.begin();
+    for (std::map<std::string, CompositeTest *>::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<string, CompositeTest::Option> &options = test->options();
+        const std::map<std::string, CompositeTest::Option> &options = test->options();
 
-        for (map<string, CompositeTest::Option>::const_iterator opt_iter = options.begin();
+        for (std::map<std::string, CompositeTest::Option>::const_iterator opt_iter = options.begin();
              opt_iter != options.end();
              opt_iter++)
         {
@@ -94,7 +94,7 @@ 
 static void
 add_custom_benchmarks(std::list<Benchmark *> &benchmarks)
 {
-    for (std::list<string>::const_iterator iter = Options::benchmarks.begin();
+    for (std::list<std::string>::const_iterator iter = Options::benchmarks.begin();
          iter != Options::benchmarks.end();
          iter++)
     {
@@ -106,9 +106,9 @@ 
 void
 assign_canvas_to_tests(std::list<CompositeCanvas *> &canvas_list)
 {
-    const map<string, CompositeTest *> &tests = Benchmark::tests();
+    const std::map<std::string, CompositeTest *> &tests = Benchmark::tests();
 
-    for (map<string, CompositeTest *>::const_iterator test_iter = tests.begin();
+    for (std::map<std::string, CompositeTest *>::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 <stdint.h>
 #include <vector>
 
-using namespace std;
-
 struct ProfilerPoint;
 
 class Profiler