Modified CompPhdr::operator() so that it provides a strict

kmillar · kmillar · commit a1eab1c9de4d · 2017-12-07T12:51:01.000-08:00
weak ordering as required by std::sort.
diff --git a/src/patchelf.cc b/src/patchelf.cc
@@ -135,7 +135,10 @@ class ElfFile
         ElfFile * elfFile;
         bool operator ()(const Elf_Phdr & x, const Elf_Phdr & y)
         {
-            if (x.p_type == PT_PHDR) return true;
+            if (x.p_type == PT_PHDR) {
+                  if (y.p_type == PT_PHDR) return false;
+                  return true;
+            }
             if (y.p_type == PT_PHDR) return false;
             return elfFile->rdi(x.p_paddr) < elfFile->rdi(y.p_paddr);
         }

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,10 @@ class ElfFile`
`135`	`135`	`ElfFile * elfFile;`
`136`	`136`	`bool operator ()(const Elf_Phdr & x, const Elf_Phdr & y)`
`137`	`137`	`{`
`138`		`- if (x.p_type == PT_PHDR) return true;`
	`138`	`+ if (x.p_type == PT_PHDR) {`
	`139`	`+ if (y.p_type == PT_PHDR) return false;`
	`140`	`+ return true;`
	`141`	`+ }`
`139`	`142`	`if (y.p_type == PT_PHDR) return false;`
`140`	`143`	`return elfFile->rdi(x.p_paddr) < elfFile->rdi(y.p_paddr);`
`141`	`144`	`}`