diff options
| author | Jose <jose@zeroc.com> | 2015-12-01 21:23:52 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-01 21:23:52 +0100 |
| commit | d63c656f325713df77499841533f80af379818c8 (patch) | |
| tree | 0f4944cb1c8e2e6d2cd242bb635f96f5c7a4990a /cpp/src/Slice/CsUtil.cpp | |
| parent | removing ObjectFactoryF.ice from python build (diff) | |
| download | ice-d63c656f325713df77499841533f80af379818c8.tar.bz2 ice-d63c656f325713df77499841533f80af379818c8.tar.xz ice-d63c656f325713df77499841533f80af379818c8.zip | |
Fix issues with handling of new builtin type Ice::Value
Remove ObjectFactoryF from ruby/php builds
Diffstat (limited to 'cpp/src/Slice/CsUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CsUtil.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index a1ab2fc869a..ac8f3d05e57 100644 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -281,7 +281,8 @@ Slice::CsGenerator::typeToString(const TypePtr& type, bool optional) "string", "Ice.Object", "Ice.ObjectPrx", - "_System.Object" + "_System.Object", + "Ice.Object" // Ice.Value }; BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); @@ -373,6 +374,7 @@ Slice::CsGenerator::isValueType(const TypePtr& type) case Builtin::KindObject: case Builtin::KindObjectProxy: case Builtin::KindLocalObject: + case Builtin::KindValue: { return false; break; |