summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/JavaUtil.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-12-01 17:36:19 +0100
committerJose <jose@zeroc.com>2015-12-01 17:36:19 +0100
commit2029ff368e49fae489b8ec8fc12f7d126b182dfb (patch)
tree6075d652b7851831c39e6f22004d8720864f1a60 /cpp/src/Slice/JavaUtil.cpp
parentThe default LMDB map size for IceGrid and IceStorm is now 10MB (Windows) (diff)
downloadice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.bz2
ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.xz
ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.zip
C++11 mapping initial commit
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
-rw-r--r--cpp/src/Slice/JavaUtil.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 3e27a14e5ee..ff3953444bc 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -650,6 +650,10 @@ Slice::JavaGenerator::getOptionalFormat(const TypePtr& type)
assert(false);
break;
}
+ case Builtin::KindValue:
+ {
+ return "Ice.OptionalFormat.Class";
+ }
}
}
@@ -765,6 +769,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
case Builtin::KindObject:
case Builtin::KindObjectProxy:
case Builtin::KindLocalObject:
+ case Builtin::KindValue:
{
break;
}
@@ -1157,6 +1162,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
break;
}
case Builtin::KindObject:
+ case Builtin::KindValue:
{
if(marshal)
{
@@ -1670,6 +1676,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
}
return;
}
+ case Builtin::KindValue:
case Builtin::KindObject:
case Builtin::KindObjectProxy:
case Builtin::KindLocalObject:
@@ -2153,6 +2160,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
case Builtin::KindObject:
case Builtin::KindObjectProxy:
case Builtin::KindLocalObject:
+ case Builtin::KindValue:
{
assert(false);
break;
@@ -2428,6 +2436,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
}
break;
}
+ case Builtin::KindValue:
case Builtin::KindObject:
case Builtin::KindObjectProxy:
case Builtin::KindLocalObject:
@@ -2678,6 +2687,7 @@ Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out,
}
break;
}
+ case Builtin::KindValue:
case Builtin::KindObject:
{
if(marshal)
@@ -3343,6 +3353,7 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out,
case Builtin::KindObject:
case Builtin::KindObjectProxy:
case Builtin::KindLocalObject:
+ case Builtin::KindValue:
{
assert(false);
break;
@@ -3618,6 +3629,7 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out,
case Builtin::KindObject:
case Builtin::KindObjectProxy:
case Builtin::KindLocalObject:
+ case Builtin::KindValue:
{
assert(false);
break;