move beats() out of #ifdef region

1 files changed, 16 insertions, 17 deletions

diff --git a/moses/Hypothesis.cpp b/moses/Hypothesis.cpp
index 4c8598638..c26889275 100644
--- a/moses/Hypothesis.cpp
+++ b/moses/Hypothesis.cpp
@@ -600,6 +600,22 @@ bool Hypothesis::operator==(const Hypothesis& other) const
   return true;
 }
 
+bool
+Hypothesis::
+beats(Hypothesis const& b) const
+{
+  if (m_totalScore != b.m_totalScore)
+    return m_totalScore > b.m_totalScore;
+  else if (m_futureScore != b.m_futureScore)
+    return m_futureScore > b.m_futureScore;
+  else if (m_prevHypo)
+    return b.m_prevHypo ? m_prevHypo->beats(*b.m_prevHypo) : true;
+  else return false;
+  // TO DO: add more tie breaking here
+  // results. We should compare other property of the hypos here.
+  // On the other hand, how likely is this going to happen?
+}
+
 #ifdef HAVE_XMLRPC_C
 void
 Hypothesis::
@@ -632,23 +648,6 @@ OutputWordAlignment(vector<xmlrpc_c::value>& out) const
     tmp[i]->OutputLocalWordAlignment(out);
 }
 
-bool
-Hypothesis::
-beats(Hypothesis const& b) const 
-{
-  if (m_totalScore != b.m_totalScore) 
-    return m_totalScore > b.m_totalScore;
-  else if (m_futureScore != b.m_futureScore)
-    return m_futureScore > b.m_futureScore;
-  else if (m_prevHypo) 
-    return b.m_prevHypo ? m_prevHypo->beats(*b.m_prevHypo) : true;
-  else return false;
-  // TO DO: add more tie breaking here
-  // results. We should compare other property of the hypos here. 
-  // On the other hand, how likely is this going to happen?
-}
-
-
 #endif