kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: clean up style a bit

Browse Source
This commit is contained in:
Bill Hoffman 2005-12-09 14:30:11 -05:00
parent 92b6c8e742
commit d13643aa92
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmDependsC.cxx
View File

@ -157,10 +157,11 @@ bool cmDependsC::WriteDependencies(const char *src, const char *obj,
std::map<cmStdString, cmIncludeLines*>::iterator fileIt=m_fileCache.find(fullName); std::map<cmStdString, cmIncludeLines*>::iterator fileIt=m_fileCache.find(fullName);
if (fileIt!=m_fileCache.end()) if (fileIt!=m_fileCache.end())
{ {
fileIt->second->used=true; fileIt->second->m_Used=true;
dependencies.insert(fullName); dependencies.insert(fullName);
for (std::list<UnscannedEntry>::const_iterator incIt= for (std::list<UnscannedEntry>::const_iterator incIt=
fileIt->second->list.begin(); incIt!=fileIt->second->list.end(); ++incIt) fileIt->second->m_UnscannedEntries.begin();
incIt!=fileIt->second->m_UnscannedEntries.end(); ++incIt)
{ {
if (m_Encountered.find(incIt->FileName) == m_Encountered.end()) if (m_Encountered.find(incIt->FileName) == m_Encountered.end())
{ {
@ -255,7 +256,7 @@ void cmDependsC::ReadCacheFile()
{ {
entry.QuotedLocation=line; entry.QuotedLocation=line;
} }
cacheEntry->list.push_back(entry); cacheEntry->m_UnscannedEntries.push_back(entry);
} }
} }
} }
@ -277,12 +278,13 @@ void cmDependsC::WriteCacheFile() const
for (std::map<cmStdString, cmIncludeLines*>::const_iterator fileIt=m_fileCache.begin(); for (std::map<cmStdString, cmIncludeLines*>::const_iterator fileIt=m_fileCache.begin();
fileIt!=m_fileCache.end(); ++fileIt) fileIt!=m_fileCache.end(); ++fileIt)
{ {
if (fileIt->second->used) if (fileIt->second->m_Used)
{ {
cacheOut<<fileIt->first.c_str()<<std::endl; cacheOut<<fileIt->first.c_str()<<std::endl;
for (std::list<UnscannedEntry>::const_iterator incIt=fileIt->second->list.begin(); for (std::list<UnscannedEntry>::const_iterator
incIt!=fileIt->second->list.end(); ++incIt) incIt=fileIt->second->m_UnscannedEntries.begin();
incIt!=fileIt->second->m_UnscannedEntries.end(); ++incIt)
{ {
cacheOut<<incIt->FileName.c_str()<<std::endl; cacheOut<<incIt->FileName.c_str()<<std::endl;
if (incIt->QuotedLocation.empty()) if (incIt->QuotedLocation.empty())
@ -303,7 +305,7 @@ void cmDependsC::WriteCacheFile() const
void cmDependsC::Scan(std::istream& is, const char* directory, const cmStdString& fullName) void cmDependsC::Scan(std::istream& is, const char* directory, const cmStdString& fullName)
{ {
cmIncludeLines* newCacheEntry=new cmIncludeLines; cmIncludeLines* newCacheEntry=new cmIncludeLines;
newCacheEntry->used=true; newCacheEntry->m_Used=true;
m_fileCache[fullName]=newCacheEntry; m_fileCache[fullName]=newCacheEntry;
// Read one line at a time. // Read one line at a time.
@ -334,7 +336,7 @@ void cmDependsC::Scan(std::istream& is, const char* directory, const cmStdString
// preprocessor-like implementation of this scanner is created. // preprocessor-like implementation of this scanner is created.
if (m_IncludeRegexScan.find(entry.FileName.c_str())) if (m_IncludeRegexScan.find(entry.FileName.c_str()))
{ {
newCacheEntry->list.push_back(entry); newCacheEntry->m_UnscannedEntries.push_back(entry);
if(m_Encountered.find(entry.FileName) == m_Encountered.end()) if(m_Encountered.find(entry.FileName) == m_Encountered.end())
{ {
m_Encountered.insert(entry.FileName); m_Encountered.insert(entry.FileName);

6
Source/cmDependsC.h
View File

@ -77,9 +77,9 @@ protected:
struct cmIncludeLines struct cmIncludeLines
{ {
cmIncludeLines():used(false) {} cmIncludeLines(): m_Used(false) {}
std::list<UnscannedEntry> list; std::list<UnscannedEntry> m_UnscannedEntries;
bool used; bool m_Used;
}; };
std::set<cmStdString> m_Encountered; std::set<cmStdString> m_Encountered;