diff options
author | Kenneth Heafield <github@kheafield.com> | 2012-10-31 00:25:05 +0400 |
---|---|---|
committer | Kenneth Heafield <github@kheafield.com> | 2012-10-31 00:25:05 +0400 |
commit | dc31857bbccbaebe1a0ea2ecac349259dc2340b7 (patch) | |
tree | 5866014098475a5873caa0dfb039e96cfcdb43ae | |
parent | 630b4d4ea9e63ca718b887ef345dca3ab73e2312 (diff) |
Reduce header pollution
-rw-r--r-- | mert/FeatureDataIterator.cpp | 3 | ||||
-rw-r--r-- | mert/FeatureDataIterator.h | 5 | ||||
-rw-r--r-- | mert/ScoreDataIterator.cpp | 3 | ||||
-rw-r--r-- | mert/ScoreDataIterator.h | 5 |
4 files changed, 14 insertions, 2 deletions
diff --git a/mert/FeatureDataIterator.cpp b/mert/FeatureDataIterator.cpp index 7ada05a61..a22112bb4 100644 --- a/mert/FeatureDataIterator.cpp +++ b/mert/FeatureDataIterator.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <sstream> #include <boost/functional/hash.hpp> +#include "util/file_piece.hh" #include "util/tokenize_piece.hh" #include "FeatureArray.h" @@ -71,6 +72,8 @@ FeatureDataIterator::FeatureDataIterator(const string& filename) { readNext(); } +FeatureDataIterator::~FeatureDataIterator() {} + void FeatureDataIterator::readNext() { m_next.clear(); try { diff --git a/mert/FeatureDataIterator.h b/mert/FeatureDataIterator.h index b8f138c49..8bbb8d497 100644 --- a/mert/FeatureDataIterator.h +++ b/mert/FeatureDataIterator.h @@ -32,11 +32,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <boost/iterator/iterator_facade.hpp> #include <boost/shared_ptr.hpp> -#include "util/file_piece.hh" +#include "util/exception.hh" #include "util/string_piece.hh" #include "FeatureStats.h" +namespace util { class FilePiece; } + namespace MosesTuning { @@ -75,6 +77,7 @@ class FeatureDataIterator : public: FeatureDataIterator(); explicit FeatureDataIterator(const std::string& filename); + ~FeatureDataIterator(); static FeatureDataIterator end() { return FeatureDataIterator(); diff --git a/mert/ScoreDataIterator.cpp b/mert/ScoreDataIterator.cpp index 6efcf5bc3..80568b810 100644 --- a/mert/ScoreDataIterator.cpp +++ b/mert/ScoreDataIterator.cpp @@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ***********************************************************************/ #include <iostream> +#include "util/file_piece.hh" #include "util/tokenize_piece.hh" #include "ScoreArray.h" @@ -37,6 +38,8 @@ ScoreDataIterator::ScoreDataIterator(const string& filename) { readNext(); } +ScoreDataIterator::~ScoreDataIterator() {} + void ScoreDataIterator::readNext() { m_next.clear(); try { diff --git a/mert/ScoreDataIterator.h b/mert/ScoreDataIterator.h index 92480def2..50640c158 100644 --- a/mert/ScoreDataIterator.h +++ b/mert/ScoreDataIterator.h @@ -29,11 +29,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <boost/iterator/iterator_facade.hpp> #include <boost/shared_ptr.hpp> -#include "util/file_piece.hh" #include "util/string_piece.hh" #include "FeatureDataIterator.h" +namespace util { class FilePiece; } + namespace MosesTuning { @@ -49,6 +50,8 @@ class ScoreDataIterator : ScoreDataIterator(); explicit ScoreDataIterator(const std::string& filename); + ~ScoreDataIterator(); + static ScoreDataIterator end() { return ScoreDataIterator(); } |