delete includes for util/check.hh

2024-09-11 11:25:40 +03:00 · 2013-11-21 18:58:28 +00:00 · 2013-11-21 18:58:28 +00:00 · 0a8390981e
commit 0a8390981e
parent 43dc333cd7
37 changed files with 4 additions and 35 deletions
--- a/OnDiskPt/OnDiskWrapper.cpp
+++ b/OnDiskPt/OnDiskWrapper.cpp
@ -24,7 +24,6 @@
 #include <string>
 #include "OnDiskWrapper.h"
 #include "moses/Factor.h"
-#include "util/check.hh"
 #include "util/exception.hh"

 using namespace std;
--- a/OnDiskPt/Phrase.cpp
+++ b/OnDiskPt/Phrase.cpp
@ -20,7 +20,6 @@
 #include <iostream>
 #include "moses/Util.h"
 #include "Phrase.h"
-#include "util/check.hh"
 #include "util/exception.hh"

 using namespace std;
--- a/OnDiskPt/PhraseNode.cpp
+++ b/OnDiskPt/PhraseNode.cpp
@ -22,7 +22,6 @@
 #include "TargetPhraseCollection.h"
 #include "SourcePhrase.h"
 #include "moses/Util.h"
-#include "util/check.hh"
 #include "util/exception.hh"

 using namespace std;
--- a/OnDiskPt/SourcePhrase.cpp
+++ b/OnDiskPt/SourcePhrase.cpp
@ -17,7 +17,6 @@
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/
-#include "util/check.hh"
 #include "SourcePhrase.h"

 namespace OnDiskPt
--- a/moses-cmd/IOWrapper.h
+++ b/moses-cmd/IOWrapper.h
@ -39,7 +39,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <fstream>
 #include <ostream>
 #include <vector>
-#include "util/check.hh"

 #include "moses/TypeDef.h"
 #include "moses/Sentence.h"
--- a/moses/ChartTranslationOptions.h
+++ b/moses/ChartTranslationOptions.h
@ -24,7 +24,6 @@
 #include "TargetPhraseCollection.h"
 #include "WordsRange.h"

-#include "util/check.hh"
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include "ChartTranslationOption.h"
--- a/moses/DecodeStep.h
+++ b/moses/DecodeStep.h
@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef moses_DecodeStep_h
 #define moses_DecodeStep_h

-#include "util/check.hh"
 #include "TypeDef.h"
 #include "FactorTypeSet.h"
 #include "Phrase.h"
--- a/moses/FF/DistortionScoreProducer.h
+++ b/moses/FF/DistortionScoreProducer.h
@ -3,7 +3,6 @@
 #include <stdexcept>
 #include <string>
 #include "StatefulFeatureFunction.h"
-#include "util/check.hh"

 namespace Moses
 {
--- a/moses/FF/ExternalFeature.cpp
+++ b/moses/FF/ExternalFeature.cpp
@ -1,5 +1,7 @@
 #include "ExternalFeature.h"
 #include <dlfcn.h>
+#include <stdlib.h>
+#include <iostream>

 using namespace std;

--- a/moses/FF/ExternalFeature.h
+++ b/moses/FF/ExternalFeature.h
@ -2,6 +2,7 @@

 #include <string>
 #include <cstring>
+#include <malloc.h>
 #include "StatefulFeatureFunction.h"
 #include "FFState.h"

--- a/moses/FF/FFState.h
+++ b/moses/FF/FFState.h
@ -1,7 +1,6 @@
 #ifndef moses_FFState_h
 #define moses_FFState_h

-#include "util/check.hh"
 #include <vector>


--- a/moses/FF/FeatureFunction.cpp
+++ b/moses/FF/FeatureFunction.cpp
@ -1,6 +1,5 @@
 #include <stdexcept>

-#include "util/check.hh"
 #include "util/exception.hh"

 #include "FeatureFunction.h"
--- a/moses/FF/InputFeature.cpp
+++ b/moses/FF/InputFeature.cpp
@ -5,7 +5,6 @@
 #include "moses/InputPath.h"
 #include "moses/StaticData.h"
 #include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h"
-#include "util/check.hh"

 using namespace std;

--- a/moses/FF/LexicalReordering/LexicalReorderingState.cpp
+++ b/moses/FF/LexicalReordering/LexicalReorderingState.cpp
@ -1,7 +1,6 @@

 #include <vector>
 #include <string>
-#include "util/check.hh"

 #include "moses/FF/FFState.h"
 #include "moses/Hypothesis.h"
--- a/moses/FF/OSM-Feature/OpSequenceModel.cpp
+++ b/moses/FF/OSM-Feature/OpSequenceModel.cpp
@ -1,7 +1,6 @@
 #include <fstream>
 #include "OpSequenceModel.h"
 #include "osmHyp.h"
-#include "util/check.hh"
 #include "moses/Util.h"

 using namespace std;
--- a/moses/FF/UnknownWordPenaltyProducer.h
+++ b/moses/FF/UnknownWordPenaltyProducer.h
@ -3,7 +3,6 @@
 // $Id$

 #include "StatelessFeatureFunction.h"
-#include "util/check.hh"

 namespace Moses
 {
--- a/moses/FF/WordPenaltyProducer.h
+++ b/moses/FF/WordPenaltyProducer.h
@ -2,7 +2,6 @@

 #include <string>
 #include "StatelessFeatureFunction.h"
-#include "util/check.hh"

 namespace Moses
 {
--- a/moses/Hypothesis.cpp
+++ b/moses/Hypothesis.cpp
@ -19,7 +19,6 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/

-#include "util/check.hh"
 #include <iostream>
 #include <limits>
 #include <vector>
--- a/moses/LM/Implementation.cpp
+++ b/moses/LM/Implementation.cpp
@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include "moses/StaticData.h"
 #include "moses/ChartManager.h"
 #include "moses/ChartHypothesis.h"
-#include "util/check.hh"

 using namespace std;

--- a/moses/LM/Rand.cpp
+++ b/moses/LM/Rand.cpp
@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include "moses/Phrase.h"
 #include "moses/InputFileStream.h"
 #include "moses/StaticData.h"
-#include "util/check.hh"
 #include "RandLM.h"

 using namespace std;
--- a/moses/LM/SRI.cpp
+++ b/moses/LM/SRI.cpp
@ -19,7 +19,6 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/

-#include "util/check.hh"
 #include <limits>
 #include <iostream>
 #include <fstream>
--- a/moses/Phrase.cpp
+++ b/moses/Phrase.cpp
@ -20,7 +20,6 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/

-#include "util/check.hh"
 #include <algorithm>
 #include <sstream>
 #include <string>
--- a/moses/PrefixTree.h
+++ b/moses/PrefixTree.h
@ -9,7 +9,6 @@

 #include <vector>
 #include <algorithm>
-#include "util/check.hh"
 #include <deque>
 #include "Util.h"
 #include "FilePtr.h"
--- a/moses/ScoreComponentCollection.h
+++ b/moses/ScoreComponentCollection.h
@ -30,7 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <boost/serialization/split_member.hpp>
 #endif

-#include "util/check.hh"

 #include "moses/FF/FeatureFunction.h"
 #include "FeatureVector.h"
--- a/moses/StaticData.cpp
+++ b/moses/StaticData.cpp
@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/

 #include <string>
-#include "util/check.hh"

 #include "TypeDef.h"
 #include "moses/FF/WordPenaltyProducer.h"
--- a/moses/TranslationModel/CYKPlusParser/DotChartInMemory.h
+++ b/moses/TranslationModel/CYKPlusParser/DotChartInMemory.h
@ -22,7 +22,6 @@
 #include "DotChart.h"
 #include "moses/TranslationModel/PhraseDictionaryNodeMemory.h"

-#include "util/check.hh"
 #include <vector>

 namespace Moses
--- a/moses/TranslationModel/CYKPlusParser/DotChartOnDisk.h
+++ b/moses/TranslationModel/CYKPlusParser/DotChartOnDisk.h
@ -20,8 +20,6 @@
 #pragma once

 #include <vector>
-#include "util/check.hh"
-
 #include "DotChart.h"

 namespace OnDiskPt
--- a/moses/TranslationModel/DynSAInclude/RandLMFilter.h
+++ b/moses/TranslationModel/DynSAInclude/RandLMFilter.h
@ -19,6 +19,7 @@

 #include <cmath>
 #include "FileHandler.h"
+#include "util/check.hh"

 #ifdef WIN32
 #define log2(X) (log((double)X)/log((double)2))
--- a/moses/TranslationModel/DynSAInclude/params.h
+++ b/moses/TranslationModel/DynSAInclude/params.h
@ -5,7 +5,6 @@
 #include <map>
 #include <set>
 #include <vector>
-#include "util/check.hh"
 #include "FileHandler.h"
 #include "utils.h"
 #include "types.h"
--- a/moses/TranslationModel/DynSAInclude/quantizer.h
+++ b/moses/TranslationModel/DynSAInclude/quantizer.h
@ -3,7 +3,6 @@

 #include <vector>
 #include <cmath>
-#include "util/check.hh"
 #include <algorithm>
 #include "types.h"

--- a/moses/TranslationModel/PhraseDictionaryMemory.h
+++ b/moses/TranslationModel/PhraseDictionaryMemory.h
@ -24,7 +24,6 @@
 #include "moses/InputType.h"
 #include "moses/NonTerminal.h"
 #include "moses/TranslationModel/RuleTable/Trie.h"
-#include "util/check.hh"

 namespace Moses
 {
--- a/moses/TranslationModel/PhraseDictionaryTree.cpp
+++ b/moses/TranslationModel/PhraseDictionaryTree.cpp
@ -3,7 +3,6 @@
 #include "moses/FeatureVector.h"
 #include "moses/TranslationModel/PhraseDictionaryTree.h"
 #include <map>
-#include "util/check.hh"
 #include <sstream>
 #include <iostream>
 #include <fstream>
--- a/moses/TranslationModel/PhraseDictionaryTreeAdaptor.h
+++ b/moses/TranslationModel/PhraseDictionaryTreeAdaptor.h
@ -6,7 +6,6 @@
 #include "moses/TypeDef.h"
 #include "moses/TargetPhraseCollection.h"
 #include "moses/TranslationModel/PhraseDictionary.h"
-#include "util/check.hh"
 #include <vector>

 #ifdef WITH_THREADS
--- a/moses/TranslationModel/RuleTable/PhraseDictionaryFuzzyMatch.cpp
+++ b/moses/TranslationModel/RuleTable/PhraseDictionaryFuzzyMatch.cpp
@ -44,7 +44,6 @@
 #include "moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.h"
 #include "moses/TranslationModel/fuzzy-match/FuzzyMatchWrapper.h"
 #include "moses/TranslationModel/fuzzy-match/SentenceAlignment.h"
-#include "util/check.hh"
 #include "util/file.hh"
 #include "util/exception.hh"

--- a/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.h
+++ b/moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.h
@ -28,7 +28,6 @@
 #include "OnDiskPt/OnDiskWrapper.h"
 #include "OnDiskPt/Word.h"
 #include "OnDiskPt/PhraseNode.h"
-#include "util/check.hh"

 #ifdef WITH_THREADS
 #include <boost/thread/tss.hpp>
--- a/moses/TranslationOptionCollectionLattice.cpp
+++ b/moses/TranslationOptionCollectionLattice.cpp
@ -10,7 +10,6 @@
 #include "FactorCollection.h"
 #include "FF/InputFeature.h"
 #include "TranslationModel/PhraseDictionaryTreeAdaptor.h"
-#include "util/check.hh"
 #include "util/exception.hh"

 using namespace std;
--- a/moses/WordLattice.cpp
+++ b/moses/WordLattice.cpp
@ -7,7 +7,6 @@
 #include "TranslationOptionCollectionLattice.h"
 #include "TranslationOptionCollectionConfusionNet.h"
 #include "moses/FF/InputFeature.h"
-#include "util/check.hh"

 namespace Moses
 {