From 5bf55d1590d2e92180b51c82b397cac8dd4c6d64 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 29 Sep 2004 16:07:07 -0400 Subject: [PATCH] ENH: shorten the symbols a bit and remove maps of std::string for map of cmStdString --- Source/cmCTest.h | 2 +- Source/cmCacheManager.cxx | 6 +++--- Source/cmCacheManager.h | 4 ++-- Source/cmDynamicLoader.cxx | 8 ++++---- Source/cmGlobalGenerator.cxx | 4 ++-- Source/cmLoadCacheCommand.cxx | 4 ++-- Source/cmLocalUnixMakefileGenerator.cxx | 20 ++++++++++---------- Source/cmMakefile.cxx | 4 ++-- Source/cmTarget.cxx | 2 +- Source/cmakewizard.cxx | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Source/cmCTest.h b/Source/cmCTest.h index a9efcc0513..fcc9bf1df0 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -206,7 +206,7 @@ private: }; //! Map of configuration properties - typedef std::map tm_DartConfigurationMap; + typedef std::map tm_DartConfigurationMap; std::string m_ToplevelPath; tm_DartConfigurationMap m_DartConfiguration; diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index d441768973..1d82f42498 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -74,7 +74,7 @@ bool cmCacheManager::LoadCache(const char* path) bool cmCacheManager::LoadCache(const char* path, bool internal) { - std::set emptySet; + std::set emptySet; return this->LoadCache(path, internal, emptySet, emptySet); } @@ -155,8 +155,8 @@ bool cmCacheManager::ParseEntry(const char* entry, bool cmCacheManager::LoadCache(const char* path, bool internal, - std::set& excludes, - std::set& includes) + std::set& excludes, + std::set& includes) { std::string cacheFile = path; cacheFile += "/CMakeCache.txt"; diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 3096ac2cdc..451dcea798 100644 --- a/Source/cmCacheManager.h +++ b/Source/cmCacheManager.h @@ -103,8 +103,8 @@ public: bool LoadCache(const char* path); bool LoadCache(const char* path, bool internal); bool LoadCache(const char* path, bool internal, - std::set& excludes, - std::set& includes); + std::set& excludes, + std::set& includes); ///! Save cache for given makefile. Saves to ouput home CMakeCache.txt. bool SaveCache(cmMakefile*) ; diff --git a/Source/cmDynamicLoader.cxx b/Source/cmDynamicLoader.cxx index 638a04376f..469401c10b 100644 --- a/Source/cmDynamicLoader.cxx +++ b/Source/cmDynamicLoader.cxx @@ -36,7 +36,7 @@ public: static cmDynamicLoaderCache* GetInstance(); private: - std::map m_CacheMap; + std::map m_CacheMap; static cmDynamicLoaderCache* Instance; }; @@ -58,7 +58,7 @@ void cmDynamicLoaderCache::CacheFile(const char* path, const cmLibHandle& p) bool cmDynamicLoaderCache::GetCacheFile(const char* path, cmLibHandle& p) { - std::map::iterator it = m_CacheMap.find(path); + std::map::iterator it = m_CacheMap.find(path); if ( it != m_CacheMap.end() ) { p = it->second; @@ -69,7 +69,7 @@ bool cmDynamicLoaderCache::GetCacheFile(const char* path, cmLibHandle& p) bool cmDynamicLoaderCache::FlushCache(const char* path) { - std::map::iterator it = m_CacheMap.find(path); + std::map::iterator it = m_CacheMap.find(path); bool ret = false; if ( it != m_CacheMap.end() ) { @@ -82,7 +82,7 @@ bool cmDynamicLoaderCache::FlushCache(const char* path) void cmDynamicLoaderCache::FlushCache() { - for ( std::map::iterator it = m_CacheMap.begin(); + for ( std::map::iterator it = m_CacheMap.begin(); it != m_CacheMap.end(); it++ ) { cmDynamicLoader::CloseLibrary(it->second); diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 098c9c93ec..beef256f8f 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -436,7 +436,7 @@ void cmGlobalGenerator::Configure() // now do it this->RecursiveConfigure(lg,0.0f,0.9f); - std::set notFoundMap; + std::set notFoundMap; // after it is all done do a ConfigureFinalPass cmCacheManager* manager = 0; for (i = 0; i < m_LocalGenerators.size(); ++i) @@ -480,7 +480,7 @@ void cmGlobalGenerator::Configure() if(notFoundMap.size()) { std::string notFoundVars; - for(std::set::iterator ii = notFoundMap.begin(); + for(std::set::iterator ii = notFoundMap.begin(); ii != notFoundMap.end(); ++ii) { notFoundVars += *ii; diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx index 2abe6d0a08..55c8357dfa 100644 --- a/Source/cmLoadCacheCommand.cxx +++ b/Source/cmLoadCacheCommand.cxx @@ -36,7 +36,7 @@ bool cmLoadCacheCommand::InitialPass(std::vector const& args) // and they can not be overridden. bool excludeFiles=false; unsigned int i; - std::set excludes; + std::set excludes; for(i=0; i const& args) // If this set is empty, no internal cache entries are // brought in. bool includeFiles=false; - std::set includes; + std::set includes; for(i=0; i emitted; + std::set emitted; // Embed runtime search paths if possible and if required. bool outputRuntime = true; @@ -1660,7 +1660,7 @@ void cmLocalUnixMakefileGenerator::OutputDependLibs(std::ostream& fout) { // Build a set of libraries that will be linked into any target in // this directory. - std::set used; + std::set used; // for each target const cmTargets &tgts = m_Makefile->GetTargets(); @@ -1669,7 +1669,7 @@ void cmLocalUnixMakefileGenerator::OutputDependLibs(std::ostream& fout) l != tgts.end(); l++) { // Each dependency should only be emitted once per target. - std::set emitted; + std::set emitted; if ((l->second.GetType() == cmTarget::SHARED_LIBRARY) || (l->second.GetType() == cmTarget::MODULE_LIBRARY) || (l->second.GetType() == cmTarget::STATIC_LIBRARY) @@ -1734,7 +1734,7 @@ void cmLocalUnixMakefileGenerator::OutputDependLibs(std::ostream& fout) // build them in this makefile. If the library is in another // directory, add a rule to jump to that directory and make sure it // exists. - for(std::set::const_iterator lib = used.begin(); + for(std::set::const_iterator lib = used.begin(); lib != used.end(); ++lib) { // loop over the list of directories that the libraries might @@ -2315,8 +2315,8 @@ bool cmLocalUnixMakefileGenerator::OutputObjectDepends(std::ostream& fout) // by the class cmMakeDepend GenerateMakefile void cmLocalUnixMakefileGenerator::OutputCheckDepends(std::ostream& fout) { - std::set emittedLowerPath; - std::set emitted; + std::set emittedLowerPath; + std::set emitted; // Iterate over every target. std::map& targets = m_Makefile->GetTargets(); fout << "# Suppresses display of executed commands\n"; @@ -2362,7 +2362,7 @@ void cmLocalUnixMakefileGenerator::OutputCheckDepends(std::ostream& fout) } } fout << "\n\n# if any of these files changes run make dependlocal\n"; - std::set::iterator i; + std::set::iterator i; for(i = emitted.begin(); i != emitted.end(); ++i) { fout << "cmake.depends: " << *i << "\n"; @@ -2371,7 +2371,7 @@ void cmLocalUnixMakefileGenerator::OutputCheckDepends(std::ostream& fout) << "\t$(MAKE) $(MAKESILENT) dependlocal\n\n"; fout << "\n\n"; fout << "# if a .h file is removed then run make dependlocal\n\n"; - for(std::set::iterator it = emitted.begin(); + for(std::set::iterator it = emitted.begin(); it != emitted.end(); ++it) { fout << *it << ":\n" @@ -2387,7 +2387,7 @@ void cmLocalUnixMakefileGenerator::OutputCustomRules(std::ostream& fout) // we cannot provide multiple rules for a single output // so we will keep track of outputs to make sure we don't write // two rules. First found wins - std::set processedOutputs; + std::set processedOutputs; // first output all custom rules const std::vector& sources = m_Makefile->GetSourceFiles(); @@ -2964,7 +2964,7 @@ void cmLocalUnixMakefileGenerator::OutputSourceObjectBuildRules(std::ostream& fo { fout << "# Rules to build source files :\n\n"; - std::set rules; + std::set rules; // Iterate over every target. std::map& targets = m_Makefile->GetTargets(); diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 87ce942ebe..c19953a739 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1413,7 +1413,7 @@ const char* cmMakefile::GetSafeDefinition(const char* def) const std::vector cmMakefile::GetDefinitions(int cacheonly /* = 0 */) const { - std::map definitions; + std::map definitions; if ( !cacheonly ) { DefinitionMap::const_iterator it; @@ -1430,7 +1430,7 @@ std::vector cmMakefile::GetDefinitions(int cacheonly /* = 0 */) con std::vector res; - std::map::iterator fit; + std::map::iterator fit; for ( fit = definitions.begin(); fit != definitions.end(); fit ++ ) { res.push_back(fit->first); diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index f74e019086..39f450ed5e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -44,7 +44,7 @@ void cmTarget::TraceVSDependencies(std::string projFile, std::vector & classes = this->GetSourceFiles(); // use a deck to keep track of processed source files std::queue srcFilesToProcess; - std::set srcFilesQueued; + std::set srcFilesQueued; std::string name; std::vector newClasses; for(std::vector::const_iterator i = classes.begin(); diff --git a/Source/cmakewizard.cxx b/Source/cmakewizard.cxx index f1c4fabad0..89236d88be 100644 --- a/Source/cmakewizard.cxx +++ b/Source/cmakewizard.cxx @@ -98,7 +98,7 @@ int cmakewizard::RunWizard(std::vector const& args) make.SetCMakeCommand(args[0].c_str()); make.LoadCache(); make.SetCacheArgs(args); - std::map askedCache; + std::map askedCache; bool asked = false; // continue asking questions until no new questions are asked do