From d8d278f41b1a04064ef84577b3add27b1301e14b Mon Sep 17 00:00:00 2001
From: hieuhoang1972 <hieuhoang1972@1f5c12ca-751b-0410-a591-d2e778427230>
Date: Sat, 21 Oct 2006 19:16:20 +0000
Subject: [PATCH] minor compile error on gcc

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@908 1f5c12ca-751b-0410-a591-d2e778427230
---
 moses/src/LanguageModelSRI.cpp   | 6 +++---
 moses/src/LanguageModelSRI.h     | 2 +-
 moses/src/PhraseDictionaryNode.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/moses/src/LanguageModelSRI.cpp b/moses/src/LanguageModelSRI.cpp
index 2d499b771..8cb1059c4 100755
--- a/moses/src/LanguageModelSRI.cpp
+++ b/moses/src/LanguageModelSRI.cpp
@@ -46,7 +46,7 @@ LanguageModelSRI::~LanguageModelSRI()
   delete m_srilmVocab;
 }
 
-void LanguageModelSRI::Load(const std::string &fileName
+void LanguageModelSRI::Load(const std::string &filePath
 												, FactorCollection &factorCollection
 												, FactorType factorType
 												, float weight
@@ -57,11 +57,11 @@ void LanguageModelSRI::Load(const std::string &fileName
 	m_factorType 	= factorType;
 	m_weight			= weight;
 	m_nGramOrder	= nGramOrder;
-	m_filename		= fileName;
+	m_filePath		= filePath;
 
 	m_srilmModel->skipOOVs() = false;
 
-	File file( fileName.c_str(), "r" );
+	File file( filePath.c_str(), "r" );
 	if (m_srilmModel->read(file))
 	{
 	}
diff --git a/moses/src/LanguageModelSRI.h b/moses/src/LanguageModelSRI.h
index b1a59f899..1ccdad327 100755
--- a/moses/src/LanguageModelSRI.h
+++ b/moses/src/LanguageModelSRI.h
@@ -50,7 +50,7 @@ protected:
 public:
 	LanguageModelSRI(bool registerScore);
 	~LanguageModelSRI();
-	void Load(const std::string &fileName
+	void Load(const std::string &filePath
 					, FactorCollection &factorCollection
 					, FactorType factorType
 					, float weight
diff --git a/moses/src/PhraseDictionaryNode.h b/moses/src/PhraseDictionaryNode.h
index 13b9ba7e5..a7b881241 100644
--- a/moses/src/PhraseDictionaryNode.h
+++ b/moses/src/PhraseDictionaryNode.h
@@ -38,7 +38,7 @@ class PhraseDictionaryNode
 
 	// only these classes are allowed to instantiate this class
 	friend class PhraseDictionaryMemory;
-	friend class NodeMap;
+	friend class std::map<Word, PhraseDictionaryNode>;
 
 protected:
 	NodeMap m_map;