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

cmMakefile: Inline Intialize method in constructor 

Since commit 80909041 (cmMakefile: Disable copy constructor, 2015-04-18)
the only call to cmMakefile::Initialize is in one constructor.  Inline
it and drop the separate method.
This commit is contained in:
Brad King 2015-05-04 10:18:50 -04:00
parent f39f0c0aec
commit 42142d4fd2
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefile.cxx
View File

@ -121,12 +121,6 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
this->AddDefaultDefinitions(); this->AddDefaultDefinitions();
this->Initialize();
}
//----------------------------------------------------------------------------
void cmMakefile::Initialize()
{
this->cmDefineRegex.compile("#cmakedefine[ \t]+([A-Za-z_0-9]*)"); this->cmDefineRegex.compile("#cmakedefine[ \t]+([A-Za-z_0-9]*)");
this->cmDefine01Regex.compile("#cmakedefine01[ \t]+([A-Za-z_0-9]*)"); this->cmDefine01Regex.compile("#cmakedefine01[ \t]+([A-Za-z_0-9]*)");
this->cmAtVarRegex.compile("(@[A-Za-z_0-9/.+-]+@)"); this->cmAtVarRegex.compile("(@[A-Za-z_0-9/.+-]+@)");

1
Source/cmMakefile.h
View File

@ -918,7 +918,6 @@ protected:
private: private:
cmMakefile(const cmMakefile& mf); cmMakefile(const cmMakefile& mf);
cmMakefile& operator=(const cmMakefile& mf); cmMakefile& operator=(const cmMakefile& mf);
void Initialize();
cmState::Snapshot StateSnapshot; cmState::Snapshot StateSnapshot;