From b48d559917f543a27b32eb73a31c5e97769dd704 Mon Sep 17 00:00:00 2001
From: Joern Rennecke <joern.rennecke@embecosm.com>
Date: Tue, 21 Oct 2014 16:24:45 +0000
Subject: [PATCH] prog_bar.cc: Qualify size_t.

        * testsuite/util/io/prog_bar.cc: Qualify size_t.
        * testsuite/util/io/prog_bar.hpp: Likewise.
        * testsuite/util/io/verified_cmd_line_input.hpp: Likewise.

From-SVN: r216520
---
 libstdc++-v3/ChangeLog                                    | 6 ++++++
 libstdc++-v3/testsuite/util/io/prog_bar.cc                | 2 +-
 libstdc++-v3/testsuite/util/io/prog_bar.hpp               | 8 ++++----
 .../testsuite/util/io/verified_cmd_line_input.hpp         | 4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 34b7e159940..9d1b1e5981c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-21  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+	* testsuite/util/io/prog_bar.cc: Qualify size_t.
+	* testsuite/util/io/prog_bar.hpp: Likewise.
+	* testsuite/util/io/verified_cmd_line_input.hpp: Likewise.
+
 2014-10-21  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
 	Implement more Library Fundamentals v1 variable templates.
diff --git a/libstdc++-v3/testsuite/util/io/prog_bar.cc b/libstdc++-v3/testsuite/util/io/prog_bar.cc
index 14f4a8711b4..ad6c29f4555 100644
--- a/libstdc++-v3/testsuite/util/io/prog_bar.cc
+++ b/libstdc++-v3/testsuite/util/io/prog_bar.cc
@@ -41,7 +41,7 @@ namespace __gnu_pbds
   namespace test
   {
     prog_bar::
-    prog_bar(size_t max, std::ostream& r_os, bool display/*= true*/) :
+    prog_bar(std::size_t max, std::ostream& r_os, bool display/*= true*/) :
       m_cur(0),
       m_max(max),
       m_cur_disp(0),
diff --git a/libstdc++-v3/testsuite/util/io/prog_bar.hpp b/libstdc++-v3/testsuite/util/io/prog_bar.hpp
index 8dc3b1f80f2..65a2909cfc4 100644
--- a/libstdc++-v3/testsuite/util/io/prog_bar.hpp
+++ b/libstdc++-v3/testsuite/util/io/prog_bar.hpp
@@ -57,7 +57,7 @@ namespace __gnu_pbds
       enum{num_disp = 40};
 
     public:
-      prog_bar(size_t max, std::ostream& r_os, bool display = true);
+      prog_bar(std::size_t max, std::ostream& r_os, bool display = true);
 
       void
       inc();
@@ -69,10 +69,10 @@ namespace __gnu_pbds
       operator=(const prog_bar& );
 
     private:
-      size_t m_cur;
-      const size_t m_max;
+      std::size_t m_cur;
+      const std::size_t m_max;
 
-      size_t m_cur_disp;
+      std::size_t m_cur_disp;
 
       std::ostream& m_r_os;
 
diff --git a/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.hpp b/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.hpp
index 86600df8625..381ce4331ef 100644
--- a/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.hpp
+++ b/libstdc++-v3/testsuite/util/io/verified_cmd_line_input.hpp
@@ -45,7 +45,7 @@ namespace __gnu_pbds
   namespace test
   {
     void
-    verify_argc(size_t given, size_t required);
+    verify_argc(std::size_t given, std::size_t required);
 
     void
     verify_prob(double prob);
@@ -56,7 +56,7 @@ namespace __gnu_pbds
     double
     get_cmd_line_prob(int argc, char* a_p_argv[], int argn);
 
-    size_t
+    std::size_t
     get_cmd_line_size(int argc, char* a_p_argv[], int argn);
 
     bool