- Added necessary zlib-win32 implementation for winbloze

- update project files for vc++ and fixed minor code issues

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

5 files changed, 11 insertions, 3 deletions

diff --git a/moses/moses.vcproj b/moses/moses.vcproj
index fabb9a980..05cb261bc 100755
--- a/moses/moses.vcproj
+++ b/moses/moses.vcproj
@@ -40,7 +40,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\mysqlpp\lib&quot;;&quot;$(SolutionDir)..\irstlm\src&quot;"

+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\mysqlpp\lib&quot;;&quot;$(SolutionDir)..\irstlm\src&quot;;&quot;$(SolutionDir)..\zlib-win32\include&quot;"

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LM_IRST;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -482,6 +482,10 @@
 				>

 			</File>

 			<File

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

+				>

+			</File>

+			<File

 				RelativePath=".\src\hash.h"

 				>

 			</File>

diff --git a/moses/src/InputFileStream.cpp b/moses/src/InputFileStream.cpp
index 6b54222f5..c32495aaf 100644
--- a/moses/src/InputFileStream.cpp
+++ b/moses/src/InputFileStream.cpp
@@ -20,10 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/
 
 #include "InputFileStream.h"
-#include <gzfilebuf.h>
+#include "gzfilebuf.h"
 
 InputFileStream::InputFileStream(const std::string &filePath)
-: m_streambuf(0)
+: std::istream(0),
+m_streambuf(0)
 {
   if (filePath.size() > 3 &&
       filePath.substr(filePath.size() - 3, 3) == ".gz")
diff --git a/moses/src/LexicalReordering.cpp b/moses/src/LexicalReordering.cpp
index 4023d7b86..9de9ab90c 100755
--- a/moses/src/LexicalReordering.cpp
+++ b/moses/src/LexicalReordering.cpp
@@ -4,6 +4,7 @@
 #include <limits>
 #include <cassert>
 #include <vector>
+#include <algorithm>
 #include "LexicalReordering.h"
 #include "InputFileStream.h"
 #include "DistortionOrientation.h"
diff --git a/moses/src/PartialTranslOptColl.cpp b/moses/src/PartialTranslOptColl.cpp
index a52287fae..ee78eb421 100644
--- a/moses/src/PartialTranslOptColl.cpp
+++ b/moses/src/PartialTranslOptColl.cpp
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/
 
 #include "PartialTranslOptColl.h"
+#include <algorithm>
 
 /** constructor, intializes counters and thresholds */
 PartialTranslOptColl::PartialTranslOptColl()
diff --git a/moses/src/PhraseDictionary.cpp b/moses/src/PhraseDictionary.cpp
index 45b179710..a5aa95016 100755
--- a/moses/src/PhraseDictionary.cpp
+++ b/moses/src/PhraseDictionary.cpp
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <fstream>
 #include <string>
 #include <iterator>
+#include <algorithm>
 #include <sys/stat.h>
 #include "PhraseDictionary.h"
 #include "FactorCollection.h"