summaryrefslogtreecommitdiff
path: root/soltools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-10-03 11:33:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-10-03 18:22:21 +0200
commit93f69ad71043aa1d1d20466a2e359478b2e7b8d8 (patch)
tree2b0ecd32e4fdd240acb10c57ee13f234c262037b /soltools
parent703009d0c5f03c48d5e092bd88d5f8db2f9ebdbb (diff)
-Werror,-Wheader-hygiene
Change-Id: Icac29e4f433b1e72603e52a0561e60cb8a7cfdef
Diffstat (limited to 'soltools')
-rw-r--r--soltools/mkdepend/collectdircontent.cxx2
-rw-r--r--soltools/mkdepend/collectdircontent.hxx14
2 files changed, 8 insertions, 8 deletions
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
index 884456a382c9..2bb66ff61763 100644
--- a/soltools/mkdepend/collectdircontent.cxx
+++ b/soltools/mkdepend/collectdircontent.cxx
@@ -1,6 +1,8 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#include "collectdircontent.hxx"
+using namespace std;
+
PathFilePair IncludesCollection::split_path(const string& filePath) {
string sepU = "/";
string sepW = "\\";
diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx
index 0c6b42357855..4980632e2fe3 100644
--- a/soltools/mkdepend/collectdircontent.hxx
+++ b/soltools/mkdepend/collectdircontent.hxx
@@ -17,22 +17,20 @@
#include <iostream>
-using namespace std;
-
-typedef set<string> DirContent;
-typedef map<string, DirContent> DirMap;
+typedef std::set<std::string> DirContent;
+typedef std::map<std::string, DirContent> DirMap;
typedef DirMap::value_type EntriesPair;
-typedef pair<string, string> PathFilePair;
+typedef std::pair<std::string, std::string> PathFilePair;
struct IncludesCollection {
private:
DirMap allIncludes;
- PathFilePair split_path(const string& filePath);
- void add_to_collection(const string& dirPath);
+ PathFilePair split_path(const std::string& filePath);
+ void add_to_collection(const std::string& dirPath);
public:
- bool exists(string filePath);
+ bool exists(std::string filePath);
};
#else