diff options
Diffstat (limited to 'src/includes_normalize.h')
| -rw-r--r-- | src/includes_normalize.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/includes_normalize.h b/src/includes_normalize.h index 0339581..7d50556 100644 --- a/src/includes_normalize.h +++ b/src/includes_normalize.h @@ -14,7 +14,6 @@ #include <string> #include <vector> -using namespace std; struct StringPiece; @@ -22,18 +21,20 @@ struct StringPiece; /// TODO: this likely duplicates functionality of CanonicalizePath; refactor. struct IncludesNormalize { /// Normalize path relative to |relative_to|. - IncludesNormalize(const string& relative_to); + IncludesNormalize(const std::string& relative_to); // Internal utilities made available for testing, maybe useful otherwise. - static string AbsPath(StringPiece s, string* err); - static string Relativize(StringPiece path, - const vector<StringPiece>& start_list, string* err); + static std::string AbsPath(StringPiece s, std::string* err); + static std::string Relativize(StringPiece path, + const std::vector<StringPiece>& start_list, + std::string* err); /// Normalize by fixing slashes style, fixing redundant .. and . and makes the /// path |input| relative to |this->relative_to_| and store to |result|. - bool Normalize(const string& input, string* result, string* err) const; + bool Normalize(const std::string& input, std::string* result, + std::string* err) const; private: - string relative_to_; - vector<StringPiece> split_relative_to_; + std::string relative_to_; + std::vector<StringPiece> split_relative_to_; }; |