summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-12-09 19:30:11 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-12-09 19:30:11 (GMT)
commitd13643aa92130a7234c90ea6f04aa98a61cf98d7 (patch)
tree2f243f6b25d309f8e5291fb91285d5bd200807e2 /Source
parent92b6c8e742df5112afd8b9cf4d0c752fe02a0619 (diff)
downloadCMake-d13643aa92130a7234c90ea6f04aa98a61cf98d7.zip
CMake-d13643aa92130a7234c90ea6f04aa98a61cf98d7.tar.gz
CMake-d13643aa92130a7234c90ea6f04aa98a61cf98d7.tar.bz2
ENH: clean up style a bit
Diffstat (limited to 'Source')
-rw-r--r--Source/cmDependsC.cxx18
-rw-r--r--Source/cmDependsC.h6
2 files changed, 13 insertions, 11 deletions
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index 5977d28..a98458b 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -157,10 +157,11 @@ bool cmDependsC::WriteDependencies(const char *src, const char *obj,
std::map<cmStdString, cmIncludeLines*>::iterator fileIt=m_fileCache.find(fullName);
if (fileIt!=m_fileCache.end())
{
- fileIt->second->used=true;
+ fileIt->second->m_Used=true;
dependencies.insert(fullName);
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())
{
@@ -255,7 +256,7 @@ void cmDependsC::ReadCacheFile()
{
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();
fileIt!=m_fileCache.end(); ++fileIt)
{
- if (fileIt->second->used)
+ if (fileIt->second->m_Used)
{
cacheOut<<fileIt->first.c_str()<<std::endl;
- for (std::list<UnscannedEntry>::const_iterator incIt=fileIt->second->list.begin();
- incIt!=fileIt->second->list.end(); ++incIt)
+ for (std::list<UnscannedEntry>::const_iterator
+ incIt=fileIt->second->m_UnscannedEntries.begin();
+ incIt!=fileIt->second->m_UnscannedEntries.end(); ++incIt)
{
cacheOut<<incIt->FileName.c_str()<<std::endl;
if (incIt->QuotedLocation.empty())
@@ -303,7 +305,7 @@ void cmDependsC::WriteCacheFile() const
void cmDependsC::Scan(std::istream& is, const char* directory, const cmStdString& fullName)
{
cmIncludeLines* newCacheEntry=new cmIncludeLines;
- newCacheEntry->used=true;
+ newCacheEntry->m_Used=true;
m_fileCache[fullName]=newCacheEntry;
// 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.
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())
{
m_Encountered.insert(entry.FileName);
diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h
index e9d335f..f358fa3 100644
--- a/Source/cmDependsC.h
+++ b/Source/cmDependsC.h
@@ -77,9 +77,9 @@ protected:
struct cmIncludeLines
{
- cmIncludeLines():used(false) {}
- std::list<UnscannedEntry> list;
- bool used;
+ cmIncludeLines(): m_Used(false) {}
+ std::list<UnscannedEntry> m_UnscannedEntries;
+ bool m_Used;
};
std::set<cmStdString> m_Encountered;