summaryrefslogtreecommitdiff
path: root/cpp/src/Transform/Data.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2003-10-22 03:31:52 +0000
committerMark Spruiell <mes@zeroc.com>2003-10-22 03:31:52 +0000
commit5c8b07a4a912ea3384834c9f99db72c86fda0e92 (patch)
tree7cc2bd3a581ec31c216f2ffd18aa2317717a986b /cpp/src/Transform/Data.cpp
parentRemoved destructor from StaticMutex and StaticRecMutex. (diff)
downloadice-5c8b07a4a912ea3384834c9f99db72c86fda0e92.tar.bz2
ice-5c8b07a4a912ea3384834c9f99db72c86fda0e92.tar.xz
ice-5c8b07a4a912ea3384834c9f99db72c86fda0e92.zip
Win32 fixes
Diffstat (limited to 'cpp/src/Transform/Data.cpp')
-rw-r--r--cpp/src/Transform/Data.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Transform/Data.cpp b/cpp/src/Transform/Data.cpp
index 0b62d6f0b5f..8793320aafe 100644
--- a/cpp/src/Transform/Data.cpp
+++ b/cpp/src/Transform/Data.cpp
@@ -1055,7 +1055,7 @@ Transform::IntegerData::doubleValue(bool convert) const
{
if(convert)
{
- return _value;
+ return static_cast<double>(_value);
}
else
{
@@ -1509,7 +1509,7 @@ bool
Transform::StringData::booleanValue(bool) const
{
_errorReporter->error("string cannot be converted to boolean");
- return 0;
+ return false;
}
Ice::Long
@@ -2348,7 +2348,7 @@ Transform::EnumData::set(const DataPtr& value, DataInterceptor& interceptor, boo
}
else
{
- _value = v;
+ _value = static_cast<Ice::Int>(v);
_name.clear();
}
}