Changeset 190 for trunk/gsdl/src/recpt

Timestamp:

1999-03-08T18:05:59+13:00 (25 years ago)

Author:

rjmcnab

Message:

Turned a couple of the sets into maps for easier use.

File:

• trunk/gsdl/src/recpt/comtypes.h (modified) (4 diffs)

trunk/gsdl/src/recpt/comtypes.h

@@ -20 +20 @@
 #  include <ospace\std\vector>
 #  include <ospace\std\list>
-#  include <ospace\std\set>
+#  include <ospace\std\map>
 #elif defined(GSDL_USE_STL_H)
 #  include <vector.h>
 #  include <list.h>
-#  include <set.h>
+#  include <map.h>
 #else
 #  include <vector>
 #  include <list>
-#  include <set>
+#  include <map>
 #endif
 
@@ -104 +104 @@
 };
 
-inline bool operator<(const FilterOption_t &f1, const FilterOption_t &f2) {
-  return ((f1.name < f2.name) || 
-      ((f1.name == f2.name) && 
-       ((f1.type < f2.type) || 
-        ((f1.type == f2.type) && 
-         ((f1.repeatable < f2.repeatable) || 
-          ((f1.repeatable == f2.repeatable) && 
-           ((f1.defaultValue < f2.defaultValue) || 
-        ((f1.defaultValue == f2.defaultValue) && 
-         (f1.validValues < f2.validValues)))))))));
-}
-
-
-struct ltFilterOption_t {
-  bool operator()(const FilterOption_t &f1, const FilterOption_t &f2) const
-  { return f1 < f2; }
-};
-
-typedef set<FilterOption_t, ltFilterOption_t> FilterOption_tset;
+typedef map<text_t, FilterOption_t, lttext_t> FilterOption_tmap;
 
 // FilterDescript ::= SEQUENCE {
@@ -132 +114 @@
 
   text_t filterName;
-  FilterOption_tset filterOptions;
-};
-
-struct ltFilterDescript_t {
-  bool operator()(const FilterDescript_t &f1, const FilterDescript_t &f2) const
-  { return ((f1.filterName < f2.filterName) || 
-        ((f1.filterName == f2.filterName) && (f1.filterOptions < f2.filterOptions))); }
-};
-
-typedef set<FilterDescript_t, ltFilterDescript_t> FilterDescript_tset;
+  FilterOption_tmap filterOptions;
+};
+
+typedef map<text_t, FilterDescript_t, lttext_t> FilterDescript_tmap;
 
 // InfoFilterOptionsResponse ::= SEQUENCE {
@@ -149 +125 @@
   void clear ();
 
-  FilterDescript_tset filterOptions;
+  FilterDescript_tmap filterOptions;
 };