summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2004-05-10 04:47:45 +0000
committerMichi Henning <michi@zeroc.com>2004-05-10 04:47:45 +0000
commit669f1e4feb47d13d2708282648a9c547488bd273 (patch)
tree5bb9e9b0086c20d11387f4f81a38a6819a204b7f /cpp/src
parentmerging changes from branch michi_pre_e3 (diff)
downloadice-669f1e4feb47d13d2708282648a9c547488bd273.tar.bz2
ice-669f1e4feb47d13d2708282648a9c547488bd273.tar.xz
ice-669f1e4feb47d13d2708282648a9c547488bd273.zip
Added slice2cs to the "all" project and fixed a header file bug.
Diffstat (limited to 'cpp/src')
-rwxr-xr-xcpp/src/slice2cs/Gen.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 3930ab0becd..ef1c115c797 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -15,7 +15,11 @@
#include <IceUtil/Functional.h>
#include <Gen.h>
#include <limits>
+#ifndef _MSC_VER
#include <unistd.h>
+#else
+#include <direct.h>
+#endif
#include <IceUtil/Algorithm.h>
#include <IceUtil/Iterator.h>
@@ -882,7 +886,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
_out << eb;
_out << nl << "__is.startReadSlice();";
DataMemberList classMembers = p->classDataMembers();
- long classMemberCount = allClassMembers.size() - classMembers.size();
+ int classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
for(d = members.begin(); d != members.end(); ++d)
{
StringList metaData = (*d)->getMetaData();
@@ -1475,7 +1479,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
_out << eb;
_out << nl << "__is.startReadSlice();";
DataMemberList classMembers = p->classDataMembers();
- long classMemberCount = allClassMembers.size() - classMembers.size();
+ int classMemberCount = static_cast<int>(allClassMembers.size() - classMembers.size());
for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
{
ostringstream patchParams;