facet fixes for FreezeScript

1 files changed, 1 insertions, 69 deletions

diff --git a/cpp/src/FreezeScript/Util.cpp b/cpp/src/FreezeScript/Util.cpp
index d263e4f3c85..9a9db346b69 100644
--- a/cpp/src/FreezeScript/Util.cpp
+++ b/cpp/src/FreezeScript/Util.cpp
@@ -49,42 +49,15 @@ FreezeScript::ignoreType(const string& type)
     //
     static const string ignoreTypeList[] =
     {
-        "::Freeze::EvictorStorageKey",
         "::Freeze::ObjectRecord",
         "::Freeze::Statistics",
-        "::Ice::FacetPath",
-        "::Ice::Identity",
-        "::_FacetMap"
+        "::Ice::Identity"
     };
 
     return binary_search(&ignoreTypeList[0], &ignoreTypeList[sizeof(ignoreTypeList) / sizeof(*ignoreTypeList)], type);
 }
 
 void
-FreezeScript::createCoreSliceTypes(const Slice::UnitPtr& unit)
-{
-    string scoped;
-    Slice::TypeList l;
-    Slice::ContainedList c;
-
-    //
-    // Create the Slice definition for _FacetMap if it doesn't exist. This type is
-    // necessary for marshaling an object's facet map.
-    //
-    l = unit->lookupTypeNoBuiltin("::_FacetMap", false);
-    if(l.empty())
-    {
-        Slice::TypePtr str = unit->builtin(Slice::Builtin::KindString);
-        Slice::TypePtr obj = unit->builtin(Slice::Builtin::KindObject);
-        unit->createDictionary("_FacetMap", str, obj, false);
-    }
-    else
-    {
-        assert(Slice::DictionaryPtr::dynamicCast(l.front()));
-    }
-}
-
-void
 FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& unit)
 {
     string scoped;
@@ -133,27 +106,6 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& unit)
     }
 
     //
-    // Create the Slice definition for Ice::FacetPath if it doesn't exist.
-    //
-    scoped = "::Ice::FacetPath";
-    l = unit->lookupTypeNoBuiltin(scoped, false);
-    Slice::SequencePtr facetPath;
-    if(l.empty())
-    {
-        Slice::TypePtr str = unit->builtin(Slice::Builtin::KindString);
-        facetPath = ice->createSequence("FacetPath", str, false);
-    }
-    else
-    {
-        facetPath = Slice::SequencePtr::dynamicCast(l.front());
-        if(!facetPath)
-        {
-            throw FailureException(__FILE__, __LINE__,
-                                   "the symbol `::Ice::FacetPath' is defined in Slice but is not a sequence");
-        }
-    }
-
-    //
     // Create the Freeze module if necessary.
     //
     c = unit->lookupContained("Freeze", false);
@@ -173,26 +125,6 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& unit)
     }
 
     //
-    // Create the Slice definition for Freeze::EvictorStorageKey if it doesn't exist.
-    //
-    scoped = "::Freeze::EvictorStorageKey";
-    l = unit->lookupTypeNoBuiltin(scoped, false);
-    if(l.empty())
-    {
-        Slice::StructPtr esk = freeze->createStruct("EvictorStorageKey", false);
-        esk->createDataMember("identity", identity);
-        esk->createDataMember("facet", facetPath);
-    }
-    else
-    {
-        if(!Slice::StructPtr::dynamicCast(l.front()))
-        {
-            throw FailureException(__FILE__, __LINE__, "the symbol `::Freeze::EvictorStorageKey' is defined in "
-                                   "Slice but is not a struct");
-        }
-    }
-
-    //
     // Create the Slice definition for Freeze::Statistics if it doesn't exist.
     //
     scoped = "::Freeze::Statistics";