visual studio issues

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@636 1f5c12ca-751b-0410-a591-d2e778427230

3 files changed, 13 insertions, 6 deletions

diff --git a/irstlm/irstlm.vcproj b/irstlm/irstlm.vcproj
index 687c036eb..23599644e 100644
--- a/irstlm/irstlm.vcproj
+++ b/irstlm/irstlm.vcproj
@@ -197,7 +197,11 @@
 				>

 			</File>

 			<File

-				RelativePath=".\src\ngram.cpp"

+				RelativePath=".\src\n_gram.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\src\ngramcache.cpp"

 				>

 			</File>

 		</Filter>

@@ -231,7 +235,11 @@
 				>

 			</File>

 			<File

-				RelativePath=".\src\ngram.h"

+				RelativePath=".\src\n_gram.h"

+				>

+			</File>

+			<File

+				RelativePath=".\src\ngramcache.h"

 				>

 			</File>

 		</Filter>

diff --git a/irstlm/src/lmtable.cpp b/irstlm/src/lmtable.cpp
index dfbe2e6d9..117231798 100644
--- a/irstlm/src/lmtable.cpp
+++ b/irstlm/src/lmtable.cpp
@@ -17,8 +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
 
 ******************************************************************************/
-using namespace std;
-
 #include <iostream>
 #include <fstream>
 
@@ -34,6 +32,7 @@ using namespace std;
 #include "n_gram.h"
 #include "lmtable.h"
 
+using namespace std;
 
 inline void error(char* message){
   cerr << message << "\n";
diff --git a/irstlm/src/ngramcache.cpp b/irstlm/src/ngramcache.cpp
index 5487864aa..ce4887847 100644
--- a/irstlm/src/ngramcache.cpp
+++ b/irstlm/src/ngramcache.cpp
@@ -17,8 +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
 
 ******************************************************************************/
-using namespace std;
-
 #include <iostream>
 #include <fstream>
 
@@ -32,6 +30,8 @@ using namespace std;
 
 #include "ngramcache.h"
 
+using namespace std;
+
 ngramcache::ngramcache(int n,int size,int maxentries){
       ngsize=n;
       infosize=size;