This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
[PATCH setup 03/13] Drop 'using namespace std;' from PickView.cc
- From: Jon Turney <jon dot turney at dronecode dot org dot uk>
- To: cygwin-apps at cygwin dot com
- Cc: Jon Turney <jon dot turney at dronecode dot org dot uk>
- Date: Sun, 5 Aug 2018 23:08:41 +0100
- Subject: [PATCH setup 03/13] Drop 'using namespace std;' from PickView.cc
- References: <20180805220851.270212-1-jon.turney@dronecode.org.uk>
---
PickView.cc | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/PickView.cc b/PickView.cc
index c583eea..57e8f85 100644
--- a/PickView.cc
+++ b/PickView.cc
@@ -28,8 +28,6 @@
#include "LogSingleton.h"
#include "Exception.h"
-using namespace std;
-
static PickView::Header pkg_headers[] = {
{"Current", 0, 0, true},
{"New", 0, 0, true},
@@ -248,10 +246,10 @@ PickView::mode_caption (views mode)
/* meant to be called on packagemeta::categories */
bool
-isObsolete (set <std::string, casecompare_lt_op> &categories)
+isObsolete (std::set <std::string, casecompare_lt_op> &categories)
{
- set <std::string, casecompare_lt_op>::const_iterator i;
-
+ std::set <std::string, casecompare_lt_op>::const_iterator i;
+
for (i = categories.begin (); i != categories.end (); ++i)
if (isObsolete (*i))
return true;
@@ -295,7 +293,7 @@ PickView::insert_category (Category *cat, bool collapsed)
return;
PickCategoryLine & catline = *new PickCategoryLine (*this, *cat, 1, collapsed);
int packageCount = 0;
- for (vector <packagemeta *>::iterator i = cat->second.begin ();
+ for (std::vector <packagemeta *>::iterator i = cat->second.begin ();
i != cat->second.end () ; ++i)
{
if (packageFilterString.empty () \
@@ -439,7 +437,7 @@ PickView::init_headers (HDC dc)
if (pkg.installed)
note_width (headers, dc, pkg.installed.Canonical_version (),
HMARGIN, current_col);
- for (set<packageversion>::iterator i = pkg.versions.begin ();
+ for (std::set<packageversion>::iterator i = pkg.versions.begin ();
i != pkg.versions.end (); ++i)
{
if (*i != pkg.installed)
--
2.17.0