diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-24 14:06:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-24 14:06:58 (GMT) |
| commit | d5d86ecf50ea5fee2ce85c5ebe0695e477024741 (patch) | |
| tree | 364172cc4c8fcd810b57bdd3ea448d57c5a586cb /Source/cmState.cxx | |
| parent | 9135e3707d18b3fc37274acc3fca3b9352309a09 (diff) | |
| parent | 3fa1b9641dd16ad93c64737fd2eeb131cca70f76 (diff) | |
| download | CMake-d5d86ecf50ea5fee2ce85c5ebe0695e477024741.zip CMake-d5d86ecf50ea5fee2ce85c5ebe0695e477024741.tar.gz CMake-d5d86ecf50ea5fee2ce85c5ebe0695e477024741.tar.bz2 | |
Merge topic 'refactor-progress'
3fa1b964 cmGlobalUnixMakefileGenerator3: Change the progress container key.
55e39276 cmState: Make it possible to order cmState::Snapshot.
04168cbb cmGlobalUnixMakefileGenerator3: Rename member.
2394584c cmGlobalGenerator: Rename progress initializer method.
b9eb3cd1 cmGlobalGenerator: Move LG to target map to subclass.
f5d2b7a6 cmGlobalGenerator: Remove clearance of map.
Diffstat (limited to 'Source/cmState.cxx')
| -rw-r--r-- | Source/cmState.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 4ad6d3b..84d8783 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -1410,3 +1410,9 @@ void cmState::Directory::ClearCompileOptions() this->DirectoryState->CompileOptionsBacktraces, this->Snapshot_.Position->CompileOptionsPosition); } + +bool cmState::Snapshot::StrictWeakOrder::operator()( + const cmState::Snapshot& lhs, const cmState::Snapshot& rhs) const +{ + return lhs.Position.StrictWeakOrdered(rhs.Position); +} |