moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-24 04:12:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few more compiler warnings (from Clang mostly).

Browse Source
This commit is contained in:
Phil Williams 2014-10-10 15:47:53 +01:00
parent ee57e59f2b
commit 05ecc914c2
8 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moses/FF/DecodeFeature.cpp
View File

@ -50,8 +50,8 @@ DecodeFeature::DecodeFeature(size_t numScoreComponents
, const std::vector<FactorType> &output
, const std::string &line)
: StatelessFeatureFunction(numScoreComponents, line)
, m_container(NULL)
, m_input(input), m_output(output)
, m_container(NULL)
{
m_inputFactors = FactorMask(input);
m_outputFactors = FactorMask(output);

1
moses/FF/ExternalFeature.h
View File

@ -87,6 +87,7 @@ protected:
class CdecFF
{
public:
virtual ~CdecFF() {}
virtual int StateSize() const = 0;
};

4
moses/FF/InternalTree.cpp
View File

@ -45,7 +45,7 @@ size_t InternalTree::AddSubTree(const std::string & line, size_t pos) {
}
}
else if (token == ' ' || token == ']') {
if (value.size() > 0 && ! m_value.size() > 0) {
if (value.size() > 0 && !(m_value.size() > 0)) {
m_value = value;
}
else if (value.size() > 0) {
@ -227,4 +227,4 @@ bool InternalTree::RecursiveSearch(const std::vector<NTLabel> & labels, std::vec
return false;
}
}
}

4
moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerOnDisk.cpp
View File

@ -39,14 +39,12 @@ ChartRuleLookupManagerOnDisk::ChartRuleLookupManagerOnDisk(
const PhraseDictionaryOnDisk &dictionary,
OnDiskPt::OnDiskWrapper &dbWrapper,
const std::vector<FactorType> &inputFactorsVec,
const std::vector<FactorType> &outputFactorsVec,
const std::string &filePath)
const std::vector<FactorType> &outputFactorsVec)
: ChartRuleLookupManagerCYKPlus(parser, cellColl)
, m_dictionary(dictionary)
, m_dbWrapper(dbWrapper)
, m_inputFactorsVec(inputFactorsVec)
, m_outputFactorsVec(outputFactorsVec)
, m_filePath(filePath)
{
UTIL_THROW_IF2(m_expandableDottedRuleListVec.size() != 0,
"Dotted rule collection not correctly initialized");

4
moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerOnDisk.h
View File

@ -41,8 +41,7 @@ public:
const PhraseDictionaryOnDisk &dictionary,
OnDiskPt::OnDiskWrapper &dbWrapper,
const std::vector<FactorType> &inputFactorsVec,
const std::vector<FactorType> &outputFactorsVec,
const std::string &filePath);
const std::vector<FactorType> &outputFactorsVec);
~ChartRuleLookupManagerOnDisk();
@ -55,7 +54,6 @@ private:
OnDiskPt::OnDiskWrapper &m_dbWrapper;
const std::vector<FactorType> &m_inputFactorsVec;
const std::vector<FactorType> &m_outputFactorsVec;
const std::string &m_filePath;
std::vector<DottedRuleStackOnDisk*> m_expandableDottedRuleListVec;
std::map<UINT64, const TargetPhraseCollection*> m_cache;
std::list<const OnDiskPt::PhraseNode*> m_sourcePhraseNode;

2
moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.cpp
View File

@ -59,7 +59,7 @@ ChartRuleLookupManager *PhraseDictionaryOnDisk::CreateRuleLookupManager(
return new ChartRuleLookupManagerOnDisk(parser, cellCollection, *this,
GetImplementation(),
m_input,
m_output, m_filePath);
m_output);
}
OnDiskPt::OnDiskWrapper &PhraseDictionaryOnDisk::GetImplementation()

1
phrase-extract/extract-ghkm/PhraseOrientation.cpp
View File

@ -38,7 +38,6 @@ PhraseOrientation::PhraseOrientation(int sourceSize,
const Alignment &alignment)
: m_countF(sourceSize)
, m_countE(targetSize)
, m_alignment(alignment)
{
// prepare data structures for alignments

1
phrase-extract/extract-ghkm/PhraseOrientation.h
View File

@ -82,7 +82,6 @@ private:
const int m_countF;
const int m_countE;
const Alignment &m_alignment;
std::vector<std::vector<int> > m_alignedToT;