diff options
| author | Mark Spruiell <mes@zeroc.com> | 2004-01-16 23:20:58 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2004-01-16 23:20:58 +0000 |
| commit | 7cb306b32fb417c30fb0b95ae7f82ac62e2e38fd (patch) | |
| tree | 10dfa207efdbf36955c0e441486e06c5da1d554d /cpp/src | |
| parent | adding FreezeScript (diff) | |
| download | ice-7cb306b32fb417c30fb0b95ae7f82ac62e2e38fd.tar.bz2 ice-7cb306b32fb417c30fb0b95ae7f82ac62e2e38fd.tar.xz ice-7cb306b32fb417c30fb0b95ae7f82ac62e2e38fd.zip | |
Win32 fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/FreezeScript/AssignVisitor.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/FreezeScript/TransformDescriptors.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/FreezeScript/AssignVisitor.cpp b/cpp/src/FreezeScript/AssignVisitor.cpp index 1037e6e96a3..ec1fb7ea5da 100644 --- a/cpp/src/FreezeScript/AssignVisitor.cpp +++ b/cpp/src/FreezeScript/AssignVisitor.cpp @@ -162,7 +162,8 @@ FreezeScript::AssignVisitor::visitEnum(const EnumDataPtr& dest) { if(_convert) { - if(!dest->setValue(i->integerValue())) + Ice::Long l = i->integerValue(); + if(l < 0 || l > INT_MAX || !dest->setValue(static_cast<Ice::Int>(l))) { rangeError(i->toString(), type); } diff --git a/cpp/src/FreezeScript/TransformDescriptors.cpp b/cpp/src/FreezeScript/TransformDescriptors.cpp index 8416887975a..ad6cdacbced 100644 --- a/cpp/src/FreezeScript/TransformDescriptors.cpp +++ b/cpp/src/FreezeScript/TransformDescriptors.cpp @@ -2058,8 +2058,8 @@ FreezeScript::SymbolTableI::EntityVisitor::getCurrent() const // // ObjectVisitor // -FreezeScript::ObjectVisitor::ObjectVisitor(ObjectDataMap& map) : - _map(map) +FreezeScript::ObjectVisitor::ObjectVisitor(ObjectDataMap& objectDataMap) : + _map(objectDataMap) { } |