From 4e3dd11f537ccad0d1d9aa0378c3685a73c45f9b Mon Sep 17 00:00:00 2001
From: Tetsuo Kiso <tetsuo-s@is.naist.jp>
Date: Wed, 1 Feb 2012 21:36:25 +0900
Subject: [PATCH] Remove virtual keyword from whoami() function.

The funtion is neither inherited from Scorer nor
StatisticsBasedScorer.
---
 mert/MergeScorer.h | 5 +++--
 mert/PerScorer.h   | 8 ++++----
 mert/TerScorer.h   | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mert/MergeScorer.h b/mert/MergeScorer.h
index 0337ec043..cc657b718 100644
--- a/mert/MergeScorer.h
+++ b/mert/MergeScorer.h
@@ -23,8 +23,9 @@ public:
 
   virtual void setReferenceFiles(const vector<string>& referenceFiles);
   virtual void prepareStats(size_t sid, const string& text, ScoreStats& entry);
-  virtual void whoami() const {
-    cerr << "I AM MergeScorer" << std::endl;
+
+  void whoami() const {
+    cerr << "I AM MergeScorer" << endl;
   }
 
 protected:
diff --git a/mert/PerScorer.h b/mert/PerScorer.h
index dbfd9f3dc..f06e2955a 100644
--- a/mert/PerScorer.h
+++ b/mert/PerScorer.h
@@ -28,10 +28,6 @@ public:
   virtual void setReferenceFiles(const vector<string>& referenceFiles);
   virtual void prepareStats(size_t sid, const string& text, ScoreStats& entry);
 
-  virtual void whoami() const {
-    cerr << "I AM PerScorer" << std::endl;
-  }
-
   virtual size_t NumberOfScores() const {
     // cerr << "PerScorer: 3" << endl;
     return 3;
@@ -39,6 +35,10 @@ public:
 
   virtual float calculateScore(const vector<int>& comps) const;
 
+  void whoami() const {
+    cerr << "I AM PerScorer" << std::endl;
+  }
+
 private:
   // no copying allowed
   PerScorer(const PerScorer&);
diff --git a/mert/TerScorer.h b/mert/TerScorer.h
index 4601775ca..7ffb4c741 100644
--- a/mert/TerScorer.h
+++ b/mert/TerScorer.h
@@ -25,10 +25,6 @@ public:
   virtual void setReferenceFiles(const vector<string>& referenceFiles);
   virtual void prepareStats(size_t sid, const string& text, ScoreStats& entry);
 
-  virtual void whoami() const {
-    cerr << "I AM TerScorer" << std::endl;
-  }
-
   virtual size_t NumberOfScores() const {
     // cerr << "TerScorer: " << (LENGTH + 1) << endl;
     return kLENGTH + 1;
@@ -36,6 +32,10 @@ public:
 
   virtual float calculateScore(const vector<int>& comps) const;
 
+  void whoami() const {
+    cerr << "I AM TerScorer" << std::endl;
+  }
+
 private:
   const int kLENGTH;