diff options
| author | Christian Federmann <cfedermann@dfki.de> | 2012-05-10 16:48:51 +0400 |
|---|---|---|
| committer | Christian Federmann <cfedermann@dfki.de> | 2012-05-10 16:48:51 +0400 |
| commit | 4ccab958085426fa9cd60f24fea26272844140ef (patch) | |
| tree | 35e78e722718e7c088ebeb010e539ada71dfd752 /OnDiskPt | |
| parent | 4448df377b70c61a75c731390d042ded80ba08ed (diff) | |
Merged in fixes for compiler warnings regarding comparing signed and unsigned integer expressions.
Diffstat (limited to 'OnDiskPt')
| -rw-r--r-- | OnDiskPt/PhraseNode.cpp | 6 | ||||
| -rw-r--r-- | OnDiskPt/TargetPhrase.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OnDiskPt/PhraseNode.cpp b/OnDiskPt/PhraseNode.cpp index 9a5cdea20..ba521c03e 100644 --- a/OnDiskPt/PhraseNode.cpp +++ b/OnDiskPt/PhraseNode.cpp @@ -55,7 +55,7 @@ PhraseNode::PhraseNode(UINT64 filePos, OnDiskWrapper &onDiskWrapper) std::fstream &file = onDiskWrapper.GetFileSource(); file.seekg(filePos); - CHECK(filePos == file.tellg()); + CHECK(filePos == (UINT64)file.tellg()); file.read((char*) &m_numChildrenLoad, sizeof(UINT64)); @@ -64,11 +64,11 @@ PhraseNode::PhraseNode(UINT64 filePos, OnDiskWrapper &onDiskWrapper) // go to start of node again file.seekg(filePos); - CHECK(filePos == file.tellg()); + CHECK(filePos == (UINT64)file.tellg()); // read everything into memory file.read(m_memLoad, memAlloc); - CHECK(filePos + memAlloc == file.tellg()); + CHECK(filePos + memAlloc == (UINT64)file.tellg()); // get value m_value = ((UINT64*)m_memLoad)[1]; diff --git a/OnDiskPt/TargetPhrase.cpp b/OnDiskPt/TargetPhrase.cpp index b740811d8..f1359f2bf 100644 --- a/OnDiskPt/TargetPhrase.cpp +++ b/OnDiskPt/TargetPhrase.cpp @@ -232,7 +232,7 @@ Moses::TargetPhrase *TargetPhrase::ConvertToMoses(const std::vector<Moses::Facto UINT64 TargetPhrase::ReadOtherInfoFromFile(UINT64 filePos, std::fstream &fileTPColl) { - CHECK(filePos == fileTPColl.tellg()); + CHECK(filePos == (UINT64)fileTPColl.tellg()); UINT64 memUsed = 0; fileTPColl.read((char*) &m_filePos, sizeof(UINT64)); @@ -240,10 +240,10 @@ UINT64 TargetPhrase::ReadOtherInfoFromFile(UINT64 filePos, std::fstream &fileTPC CHECK(m_filePos != 0); memUsed += ReadAlignFromFile(fileTPColl); - CHECK((memUsed + filePos) == fileTPColl.tellg()); + CHECK((memUsed + filePos) == (UINT64)fileTPColl.tellg()); memUsed += ReadScoresFromFile(fileTPColl); - CHECK((memUsed + filePos) == fileTPColl.tellg()); + CHECK((memUsed + filePos) == (UINT64)fileTPColl.tellg()); return memUsed; } |