ENH: a warning fix and some more cleanup

This commit is contained in:
Ken Martin 2006-03-16 09:33:23 -05:00
parent 438c49f2a3
commit 4b83a08b37
7 changed files with 13 additions and 24 deletions

View File

@ -74,8 +74,6 @@ public:
cmTypeMacro(cmAddTestCommand, cmCommand); cmTypeMacro(cmAddTestCommand, cmCommand);
private:
std::string m_Test;
}; };

View File

@ -31,13 +31,13 @@
class cmData class cmData
{ {
public: public:
cmData(const char* name): m_Name(name) {} cmData(const char* name): Name(name) {}
virtual ~cmData() {} virtual ~cmData() {}
const std::string& GetName() const const std::string& GetName() const
{ return m_Name; } { return this->Name; }
protected: protected:
std::string m_Name; std::string Name;
}; };
#endif #endif

View File

@ -38,7 +38,7 @@ cmDependsC::cmDependsC(std::vector<std::string> const& includes,
IncludeRegexScan(scanRegex), IncludeRegexScan(scanRegex),
IncludeRegexComplain(complainRegex), IncludeRegexComplain(complainRegex),
GeneratedFiles(&generatedFiles), GeneratedFiles(&generatedFiles),
cacheFileName(cacheFileName) CacheFileName(cacheFileName)
{ {
this->ReadCacheFile(); this->ReadCacheFile();
} }
@ -212,11 +212,11 @@ bool cmDependsC::WriteDependencies(const char *src, const char *obj,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmDependsC::ReadCacheFile() void cmDependsC::ReadCacheFile()
{ {
if(this->cacheFileName.size() == 0) if(this->CacheFileName.size() == 0)
{ {
return; return;
} }
std::ifstream fin(this->cacheFileName.c_str()); std::ifstream fin(this->CacheFileName.c_str());
if(!fin) if(!fin)
{ {
return; return;
@ -240,7 +240,7 @@ void cmDependsC::ReadCacheFile()
haveFileName=true; haveFileName=true;
int newer=0; int newer=0;
cmFileTimeComparison comp; cmFileTimeComparison comp;
bool res=comp.FileTimeCompare(this->cacheFileName.c_str(), bool res=comp.FileTimeCompare(this->CacheFileName.c_str(),
line.c_str(), &newer); line.c_str(), &newer);
if ((res==true) && (newer==1)) //cache is newer than the parsed file if ((res==true) && (newer==1)) //cache is newer than the parsed file
@ -268,11 +268,11 @@ void cmDependsC::ReadCacheFile()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmDependsC::WriteCacheFile() const void cmDependsC::WriteCacheFile() const
{ {
if(this->cacheFileName.size() == 0) if(this->CacheFileName.size() == 0)
{ {
return; return;
} }
std::ofstream cacheOut(this->cacheFileName.c_str()); std::ofstream cacheOut(this->CacheFileName.c_str());
if(!cacheOut) if(!cacheOut)
{ {
return; return;

View File

@ -93,7 +93,7 @@ protected:
std::map<cmStdString, cmIncludeLines *> fileCache; std::map<cmStdString, cmIncludeLines *> fileCache;
cmStdString cacheFileName; cmStdString CacheFileName;
void WriteCacheFile() const; void WriteCacheFile() const;
void ReadCacheFile(); void ReadCacheFile();

View File

@ -240,11 +240,11 @@ private:
class cmOStrStreamCleanup class cmOStrStreamCleanup
{ {
public: public:
cmOStrStreamCleanup(std::ostrstream& ostr): m_OStrStream(ostr) {} cmOStrStreamCleanup(std::ostrstream& ostr): OStrStream(ostr) {}
~cmOStrStreamCleanup() { m_OStrStream.rdbuf()->freeze(0); } ~cmOStrStreamCleanup() { this->OStrStream.rdbuf()->freeze(0); }
static void IgnoreUnusedVariable(const cmOStrStreamCleanup&) {} static void IgnoreUnusedVariable(const cmOStrStreamCleanup&) {}
protected: protected:
std::ostrstream& m_OStrStream; std::ostrstream& OStrStream;
}; };
class cmOStringStream: public std::ostrstream class cmOStringStream: public std::ostrstream

View File

@ -75,12 +75,6 @@ public:
protected: protected:
void CopyAndFullPathMesaHeader(const char* source, void CopyAndFullPathMesaHeader(const char* source,
const char* outdir); const char* outdir);
private:
std::vector<cmSourceFile> m_WrapClasses;
std::vector<std::string> m_WrapHeaders;
std::string m_LibraryName;
std::string m_SourceList;
std::vector<std::string> m_Commands;
}; };

View File

@ -73,9 +73,6 @@ public:
} }
cmTypeMacro(cmVariableRequiresCommand, cmCommand); cmTypeMacro(cmVariableRequiresCommand, cmCommand);
private:
std::string m_ErrorMessage;
bool m_RequirementsMet;
}; };