diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-01-29 22:19:40 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-02-05 19:44:25 (GMT) |
| commit | 421eadb45b48d40aa7d0b5e42a48df4ba94b9fc0 (patch) | |
| tree | 3cddbf25b8b42e59b401e0d0a5670dab2a4c7e83 /Source/CPack | |
| parent | 098160d5f2a1aa35d2f14c585dd87cefd8f56f41 (diff) | |
| download | CMake-421eadb45b48d40aa7d0b5e42a48df4ba94b9fc0.zip CMake-421eadb45b48d40aa7d0b5e42a48df4ba94b9fc0.tar.gz CMake-421eadb45b48d40aa7d0b5e42a48df4ba94b9fc0.tar.bz2 | |
Remove use of cmsys_stl.
It is not needed.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/OSXScriptLauncher.cxx | 8 | ||||
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx index d9d6236..1d7afbd 100644 --- a/Source/CPack/OSXScriptLauncher.cxx +++ b/Source/CPack/OSXScriptLauncher.cxx @@ -26,7 +26,7 @@ int main(int argc, char* argv[]) { //if ( cmsys::SystemTools::FileExists( - cmsys_stl::string cwd = cmsys::SystemTools::GetCurrentWorkingDirectory(); + std::string cwd = cmsys::SystemTools::GetCurrentWorkingDirectory(); cmsys::ofstream ofs("/tmp/output.txt"); CFStringRef fileName; @@ -66,7 +66,7 @@ int main(int argc, char* argv[]) //dispose of the CF variable CFRelease(scriptFileURL); - cmsys_stl::string fullScriptPath = reinterpret_cast<char*>(path); + std::string fullScriptPath = reinterpret_cast<char*>(path); delete [] path; @@ -75,10 +75,10 @@ int main(int argc, char* argv[]) return 1; } - cmsys_stl::string scriptDirectory = cmsys::SystemTools::GetFilenamePath( + std::string scriptDirectory = cmsys::SystemTools::GetFilenamePath( fullScriptPath); ofs << fullScriptPath.c_str() << cmsys_ios::endl; - cmsys_stl::vector<const char*> args; + std::vector<const char*> args; args.push_back(fullScriptPath.c_str()); int cc; for ( cc = 1; cc < argc; ++ cc ) diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 8f63ca2..fe6cc95 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -654,7 +654,7 @@ bool cmCPackNSISGenerator::GetListOfSubdirectories(const char* topdir, if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),".") && strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)),"..")) { - cmsys_stl::string fullPath = topdir; + std::string fullPath = topdir; fullPath += "/"; fullPath += dir.GetFile(static_cast<unsigned long>(fileNum)); if(cmsys::SystemTools::FileIsDirectory(fullPath) && |