diff options
Diffstat (limited to 'Source/kwsys/Directory.cxx')
| -rw-r--r-- | Source/kwsys/Directory.cxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Source/kwsys/Directory.cxx b/Source/kwsys/Directory.cxx index 58cea63..c549792 100644 --- a/Source/kwsys/Directory.cxx +++ b/Source/kwsys/Directory.cxx @@ -16,20 +16,17 @@ #include KWSYS_HEADER(Encoding.hxx) -#include KWSYS_HEADER(stl/string) -#include KWSYS_HEADER(stl/vector) - // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 # include "Directory.hxx.in" # include "Configure.hxx.in" # include "Encoding.hxx.in" -# include "kwsys_stl.hxx.in" -# include "kwsys_stl_string.hxx.in" -# include "kwsys_stl_vector.hxx.in" #endif +#include <string> +#include <vector> + namespace KWSYS_NAMESPACE { @@ -38,10 +35,10 @@ class DirectoryInternals { public: // Array of Files - kwsys_stl::vector<kwsys_stl::string> Files; + std::vector<std::string> Files; // Path to Open'ed directory - kwsys_stl::string Path; + std::string Path; }; //---------------------------------------------------------------------------- @@ -103,7 +100,7 @@ void Directory::Clear() namespace KWSYS_NAMESPACE { -bool Directory::Load(const kwsys_stl::string& name) +bool Directory::Load(const std::string& name) { this->Clear(); #if _MSC_VER < 1300 @@ -153,7 +150,7 @@ bool Directory::Load(const kwsys_stl::string& name) return _findclose(srchHandle) != -1; } -unsigned long Directory::GetNumberOfFilesInDirectory(const kwsys_stl::string& name) +unsigned long Directory::GetNumberOfFilesInDirectory(const std::string& name) { #if _MSC_VER < 1300 long srchHandle; @@ -220,7 +217,7 @@ unsigned long Directory::GetNumberOfFilesInDirectory(const kwsys_stl::string& na namespace KWSYS_NAMESPACE { -bool Directory::Load(const kwsys_stl::string& name) +bool Directory::Load(const std::string& name) { this->Clear(); @@ -240,7 +237,7 @@ bool Directory::Load(const kwsys_stl::string& name) return 1; } -unsigned long Directory::GetNumberOfFilesInDirectory(const kwsys_stl::string& name) +unsigned long Directory::GetNumberOfFilesInDirectory(const std::string& name) { DIR* dir = opendir(name.c_str()); |