From b8b097d186cd816e7c238b261e35e0a5ccf7b180 Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Thu, 18 Oct 2012 00:22:00 +0200
Subject: Minor fix for VS2010 builds

---
 cpp/src/IceGrid/Parser.cpp | 4 ++--
 cpp/src/IceGrid/Parser.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index a2eac633f04..e17cdc115c3 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2188,7 +2188,7 @@ Parser::showWarranty()
 }
 
 void
-Parser::getInput(char* buf, size_t& result, size_t maxSize)
+Parser::getInput(char* buf, int& result, int maxSize)
 {
     if(!_commands.empty())
     {
@@ -2198,7 +2198,7 @@ Parser::getInput(char* buf, size_t& result, size_t maxSize)
         }
         else
         {
-            result = min(maxSize, _commands.length());
+            result = min(maxSize, static_cast<int>(_commands.length()));
             strncpy(buf, _commands.c_str(), result);
             _commands.erase(0, result);
             if(_commands.empty())
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index 29006dd998e..0234d1a43f6 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -126,7 +126,7 @@ public:
     void showCopying();
     void showWarranty();
 
-    void getInput(char*, size_t&, size_t);
+    void getInput(char*, int&, int);
     void continueLine();
     const char* getPrompt();
 
-- 
cgit v1.2.3