From 5e3a65893229877f62eaadb75775d6f9da28b7f5 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Tue, 19 Dec 2006 16:21:57 +0100
Subject: [PATCH] Made a method pure virtual.

---
 src/p_vmlinx.cpp | 12 +++---------
 src/p_vmlinx.h   |  8 ++++----
 src/packmast.cpp |  1 -
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/p_vmlinx.cpp b/src/p_vmlinx.cpp
index 5824be82..2ec33195 100644
--- a/src/p_vmlinx.cpp
+++ b/src/p_vmlinx.cpp
@@ -69,12 +69,6 @@ PackVmlinuxBase<T>::~PackVmlinuxBase()
     delete [] shdri;
 }
 
-template <class T>
-int PackVmlinuxBase<T>::is_valid_e_entry(Addr /*e_entry*/)
-{
-    return 0;
-}
-
 template <class T>
 int PackVmlinuxBase<T>::getStrategy(Filter &/*ft*/)
 {
@@ -256,7 +250,7 @@ const int *PackVmlinuxARM::getFilters() const
 //  LOAD           0x27b000 0xc067a000 0x0067a000 0x10ee64 0x1b07e8 RWE 0x1000
 //  NOTE           0x000000 0x00000000 0x00000000 0x00000 0x00000 R   0x4
 
-int PackVmlinuxI386::is_valid_e_entry(Addr e_entry)
+bool PackVmlinuxI386::is_valid_e_entry(Addr e_entry)
 {
     return 0==(0x000fffff & e_entry); // entry on whole 1MB
 }
@@ -293,7 +287,7 @@ void PackVmlinuxI386::buildLoader(const Filter *ft)
               "LINUX992,IDENTSTR,UPX1HEAD", NULL);
 }
 
-int PackVmlinuxARM::is_valid_e_entry(Addr e_entry)
+bool PackVmlinuxARM::is_valid_e_entry(Addr e_entry)
 {
     return 0xc0008000==e_entry;
 }
@@ -1180,7 +1174,7 @@ const int *PackVmlinuxAMD64::getFilters() const
     return filters;
 }
 
-int PackVmlinuxAMD64::is_valid_e_entry(Addr e_entry)
+bool PackVmlinuxAMD64::is_valid_e_entry(Addr e_entry)
 {
     return 0x200000<=e_entry; // 2MB
 }
diff --git a/src/p_vmlinx.h b/src/p_vmlinx.h
index ee83e5d9..1cd643b1 100644
--- a/src/p_vmlinx.h
+++ b/src/p_vmlinx.h
@@ -78,7 +78,7 @@ protected:
 
     virtual Shdr const *getElfSections();
     virtual int getStrategy(Filter &/*ft*/);
-    virtual int is_valid_e_entry(Addr);
+    virtual bool is_valid_e_entry(Addr) = 0;
     virtual bool canPack();
     static int __acc_cdecl_qsort compare_Phdr(void const *aa, void const *bb);
 };
@@ -104,7 +104,7 @@ public:
 protected:
     virtual void buildLoader(const Filter *ft);
     virtual Linker* newLinker() const;
-    virtual int is_valid_e_entry(Addr);
+    virtual bool is_valid_e_entry(Addr);
 };
 
 
@@ -128,7 +128,7 @@ public:
 protected:
     virtual void buildLoader(const Filter *ft);
     virtual Linker* newLinker() const;
-    virtual int is_valid_e_entry(Addr);
+    virtual bool is_valid_e_entry(Addr);
 };
 
 
@@ -152,7 +152,7 @@ public:
 protected:
     virtual void buildLoader(const Filter *ft);
     virtual Linker* newLinker() const;
-    virtual int is_valid_e_entry(Addr);
+    virtual bool is_valid_e_entry(Addr);
 };
 
 
diff --git a/src/packmast.cpp b/src/packmast.cpp
index 4c38a367..f51ec970 100644
--- a/src/packmast.cpp
+++ b/src/packmast.cpp
@@ -55,7 +55,6 @@
 #include "p_ps1.h"
 #include "p_mach.h"
 #include "p_armpe.h"
-#include "linker.h"
 
 
 /*************************************************************************