Merge pull request #13 from tetsuok/fix-warnings

Fix warnings: -Wreorder and -Wmismatched-tags.
This commit is contained in:
Phil Williams 2012-05-06 07:47:34 -07:00
commit e877e5c3f2
7 changed files with 12 additions and 11 deletions

View File

@ -38,10 +38,10 @@ size_t PhraseNode::GetNodeSize(size_t numChildren, size_t wordSize, size_t count
} }
PhraseNode::PhraseNode() PhraseNode::PhraseNode()
:m_currChild(NULL) : m_value(0)
,m_currChild(NULL)
,m_saved(false) ,m_saved(false)
,m_memLoad(NULL) ,m_memLoad(NULL)
,m_value(0)
{ {
} }

View File

@ -27,8 +27,8 @@
namespace Moses namespace Moses
{ {
class ApplicableRuleTrie; struct ApplicableRuleTrie;
class VarSpanNode; struct VarSpanNode;
class VarSpanTrieBuilder class VarSpanTrieBuilder
{ {

View File

@ -51,10 +51,11 @@ protected:
float m_transScore; float m_transScore;
float m_fullScore; float m_fullScore;
ScoreComponentCollection m_scoreBreakdown; ScoreComponentCollection m_scoreBreakdown;
const AlignmentInfo *m_alignmentInfo;
// in case of confusion net, ptr to source phrase // in case of confusion net, ptr to source phrase
Phrase const* m_sourcePhrase; Phrase const* m_sourcePhrase;
const AlignmentInfo *m_alignmentInfo;
Word m_lhsTarget; Word m_lhsTarget;
public: public:

View File

@ -10,7 +10,7 @@
namespace moses { namespace moses {
class Options; struct Options;
// Tool for converting a rule table into a more compact format. // Tool for converting a rule table into a more compact format.
class Compactify : public Tool { class Compactify : public Tool {

View File

@ -30,7 +30,7 @@ namespace Moses {
namespace GHKM { namespace GHKM {
class Node; class Node;
class Options; struct Options;
class ComposedRule class ComposedRule
{ {
@ -60,8 +60,8 @@ class ComposedRule
std::vector<const Subgraph *> m_attachedRules; std::vector<const Subgraph *> m_attachedRules;
std::queue<const Node *> m_openAttachmentPoints; std::queue<const Node *> m_openAttachmentPoints;
int m_depth; int m_depth;
int m_nodeCount;
int m_size; int m_size;
int m_nodeCount;
}; };
} // namespace GHKM } // namespace GHKM

View File

@ -30,7 +30,7 @@
namespace Moses { namespace Moses {
namespace GHKM { namespace GHKM {
class Options; struct Options;
class ParseTree; class ParseTree;
class ExtractGHKM class ExtractGHKM

View File

@ -26,9 +26,9 @@
namespace Moses { namespace Moses {
namespace GHKM { namespace GHKM {
class Options; struct Options;
class ScfgRule; class ScfgRule;
class Symbol; struct Symbol;
class ScfgRuleWriter class ScfgRuleWriter
{ {