Fix

4 files changed, 39 insertions, 2 deletions

diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp
index 71087e0e899..ac548970e9f 100644
--- a/cpp/src/IceGrid/FileCache.cpp
+++ b/cpp/src/IceGrid/FileCache.cpp
@@ -36,7 +36,11 @@ FileCache::read(const string& filename, Ice::Long offset, int count, Ice::Long&
 	return Ice::StringSeq();
     }
 
-    is.seekg(offset);
+#ifdef _WIN32
+    is.seekg(static_cast<int>(offset));
+#else
+    is.seekg(static_cast<streampos>(offset));
+#endif
     Ice::StringSeq lines;
     for(int i = 0; i < count && is.good(); ++i)
     {
diff --git a/cpp/src/IceGrid/FileCache.h b/cpp/src/IceGrid/FileCache.h
new file mode 100644
index 00000000000..0a493b11c8b
--- /dev/null
+++ b/cpp/src/IceGrid/FileCache.h
@@ -0,0 +1,32 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_GRID_FILE_CACHE_H
+#define ICE_GRID_FILE_CACHE_H
+
+#include <IceUtil/Shared.h>
+#include <Ice/BuiltinSequences.h>
+
+namespace IceGrid
+{
+
+class FileCache : public IceUtil::Shared
+{
+public:
+
+    FileCache();
+
+    Ice::StringSeq read(const std::string&, Ice::Long, int, Ice::Long&);
+
+};
+typedef IceUtil::Handle<FileCache> FileCachePtr;
+
+};
+
+#endif
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index a132eaa2319..00406de4c48 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -51,6 +51,7 @@ ADMIN_OBJS	= Grammar.obj \
 COMMON_OBJS	= Internal.obj \
 		  DescriptorParser.obj \
 		  DescriptorBuilder.obj \
+		  FileCache.obj \
 		  TraceLevels.obj \
 		  PlatformInfo.obj
 
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index f2166371add..0601951648a 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -1384,7 +1384,7 @@ Parser::dumpFile(const string& reader, const string& filename, const list<string
 		if(remove > 0)
 		{
 		    lastLines.erase(lastLines.begin(), lastLines.begin() + remove);
-		    assert(lastLines.size() == lineCount);
+		    assert(lastLines.size() == static_cast<unsigned int>(lineCount));
 		}
 
 		if(lines.size() < 20)