sequence, dictionary

1 files changed, 24 insertions, 24 deletions

diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index c4a030b9ad9..660f5ba9992 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -39,8 +39,8 @@ class Proxy;
 class Struct;
 class Operation;
 class DataMember;
-class Vector;
-class Map;
+class Sequence;
+class Dictionary;
 class Enum;
 class Enumerator;
 class Native;
@@ -79,10 +79,10 @@ void ICE_API incRef(::Slice::Operation*);
 void ICE_API decRef(::Slice::Operation*);
 void ICE_API incRef(::Slice::DataMember*);
 void ICE_API decRef(::Slice::DataMember*);
-void ICE_API incRef(::Slice::Vector*);
-void ICE_API decRef(::Slice::Vector*);
-void ICE_API incRef(::Slice::Map*);
-void ICE_API decRef(::Slice::Map*);
+void ICE_API incRef(::Slice::Sequence*);
+void ICE_API decRef(::Slice::Sequence*);
+void ICE_API incRef(::Slice::Dictionary*);
+void ICE_API decRef(::Slice::Dictionary*);
 void ICE_API incRef(::Slice::Enum*);
 void ICE_API decRef(::Slice::Enum*);
 void ICE_API incRef(::Slice::Enumerator*);
@@ -111,8 +111,8 @@ typedef ::IceInternal::Handle<Proxy> ProxyPtr;
 typedef ::IceInternal::Handle<Struct> StructPtr;
 typedef ::IceInternal::Handle<Operation> OperationPtr;
 typedef ::IceInternal::Handle<DataMember> DataMemberPtr;
-typedef ::IceInternal::Handle<Vector> VectorPtr;
-typedef ::IceInternal::Handle<Map> MapPtr;
+typedef ::IceInternal::Handle<Sequence> SequencePtr;
+typedef ::IceInternal::Handle<Dictionary> DictionaryPtr;
 typedef ::IceInternal::Handle<Enum> EnumPtr;
 typedef ::IceInternal::Handle<Enumerator> EnumeratorPtr;
 typedef ::IceInternal::Handle<Native> NativePtr;
@@ -131,8 +131,8 @@ typedef std::list<ContainedPtr> ContainedList;
 typedef std::list<ModulePtr> ModuleList;
 typedef std::list<ClassDefPtr> ClassList;
 typedef std::list<StructPtr> StructList;
-typedef std::list<VectorPtr> VectorList;
-typedef std::list<MapPtr> MapList;
+typedef std::list<SequencePtr> SequenceList;
+typedef std::list<DictionaryPtr> DictionaryList;
 typedef std::list<EnumPtr> EnumList;
 typedef std::list<NativePtr> NativeList;
 typedef std::list<OperationPtr> OperationList;
@@ -158,8 +158,8 @@ public:
     virtual void visitStructEnd(const StructPtr&) { }
     virtual void visitOperation(const OperationPtr&) { }
     virtual void visitDataMember(const DataMemberPtr&) { }
-    virtual void visitVector(const VectorPtr&) { }
-    virtual void visitMap(const MapPtr&) { }
+    virtual void visitSequence(const SequencePtr&) { }
+    virtual void visitDictionary(const DictionaryPtr&) { }
     virtual void visitEnum(const EnumPtr&) { }
     virtual void visitNative(const NativePtr&) { }
 };
@@ -255,8 +255,8 @@ public:
 
     enum ContainedType
     {
-	ContainedTypeVector,
-	ContainedTypeMap,
+	ContainedTypeSequence,
+	ContainedTypeDictionary,
 	ContainedTypeEnum,
 	ContainedTypeEnumerator,
 	ContainedTypeNative,
@@ -295,8 +295,8 @@ public:
     ClassDefPtr createClassDef(const std::string&, bool, bool, const ClassList&);
     ClassDeclPtr createClassDecl(const std::string&, bool, bool);
     StructPtr createStruct(const std::string&);
-    VectorPtr createVector(const std::string&, const TypePtr&);
-    MapPtr createMap(const std::string&, const TypePtr&, const TypePtr&);
+    SequencePtr createSequence(const std::string&, const TypePtr&);
+    DictionaryPtr createDictionary(const std::string&, const TypePtr&, const TypePtr&);
     EnumPtr createEnum(const std::string&, const StringList&);
     EnumeratorPtr createEnumerator(const std::string&);
     NativePtr createNative(const std::string&);
@@ -306,8 +306,8 @@ public:
     ModuleList modules();
     ClassList classes();
     StructList structs();
-    VectorList vectors();
-    MapList maps();
+    SequenceList sequences();
+    DictionaryList dictionaries();
     EnumList enums();
     NativeList natives();
     int includeLevel();
@@ -505,10 +505,10 @@ protected:
 };
 
 // ----------------------------------------------------------------------
-// Vector
+// Sequence
 // ----------------------------------------------------------------------
 
-class ICE_API Vector : virtual public Constructed
+class ICE_API Sequence : virtual public Constructed
 {
 public:
 
@@ -518,17 +518,17 @@ public:
 
 protected:
 
-    Vector(const ContainerPtr&, const std::string&, const TypePtr&);
+    Sequence(const ContainerPtr&, const std::string&, const TypePtr&);
     friend class ICE_API Container;
 
     TypePtr _type;
 };
 
 // ----------------------------------------------------------------------
-// Map
+// Dictionary
 // ----------------------------------------------------------------------
 
-class ICE_API Map : virtual public Constructed
+class ICE_API Dictionary : virtual public Constructed
 {
 public:
 
@@ -539,7 +539,7 @@ public:
 
 protected:
 
-    Map(const ContainerPtr&, const std::string&, const TypePtr&, const TypePtr&);
+    Dictionary(const ContainerPtr&, const std::string&, const TypePtr&, const TypePtr&);
     friend class ICE_API Container;
 
     TypePtr _keyType;