1 --- aptitude-0.2.11.1/src/generic/config_signal.h.orig Thu Nov 22 16:20:01 2001
2 +++ aptitude-0.2.11.1/src/generic/config_signal.h Sun Jan 19 14:12:11 2003
5 Configuration *real_config, *theme_config;
7 - typedef std::hash_map<string, SigC::Signal1<void, string> *> connhash;
8 + typedef __gnu_cxx::hash_map<string, SigC::Signal1<void, string> *> connhash;
12 --- aptitude-0.2.11.1/src/generic/pkg_hier.cc.orig Sat Aug 25 16:27:33 2001
13 +++ aptitude-0.2.11.1/src/generic/pkg_hier.cc Sun Jan 19 14:16:40 2003
15 #include "../aptitude.h"
18 +using namespace __gnu_cxx;
20 void pkg_hier::visit_item(pkg_hier::item *item, void *parent_data,
21 pkg_hier::hierarchy_realizer *realizer)
22 --- aptitude-0.2.11.1/src/generic/pkg_hier.h.orig Sat Aug 25 16:27:33 2001
23 +++ aptitude-0.2.11.1/src/generic/pkg_hier.h Sun Jan 19 14:13:29 2003
28 - std::hash_set<std::string> parents;
29 + __gnu_cxx::hash_set<std::string> parents;
31 // HACK: Used to build the hierarchy top-down. Calls an appropriate
32 // routine in the given hierarchy class. parent_data is an opaque
34 // Used so that group numbers are contiguous and unique
37 - typedef std::hash_map<std::string, item> pkgmap;
38 - typedef std::hash_map<std::string, group> groupmap;
39 + typedef __gnu_cxx::hash_map<std::string, item> pkgmap;
40 + typedef __gnu_cxx::hash_map<std::string, group> groupmap;
44 --- aptitude-0.2.11.1/src/generic/strhash.h.orig Fri Aug 10 03:24:36 2001
45 +++ aptitude-0.2.11.1/src/generic/strhash.h Sun Jan 19 14:15:13 2003
49 #if defined(HAVE_HASH_MAP) || defined(HAVE_EXT_HASH_MAP)
54 + struct hash<std::string>
56 - inline size_t operator()(const string &s) const
57 + inline size_t operator()(const std::string &s) const
59 return hash<char *>()(s.c_str());
61 --- aptitude-0.2.11.1/src/vscreen/config/colors.cc.orig Sat Mar 16 04:40:13 2002
62 +++ aptitude-0.2.11.1/src/vscreen/config/colors.cc Sun Jan 19 14:25:58 2003
64 #include "../../generic/strhash.h"
67 +using namespace __gnu_cxx;
70 // FIXME: is this right? I --assume-- that it is; the curses documentation
71 --- aptitude-0.2.11.1/src/vscreen/config/keybindings.cc.orig Sat Mar 16 04:40:13 2002
72 +++ aptitude-0.2.11.1/src/vscreen/config/keybindings.cc Sun Jan 19 14:27:04 2003
77 +using namespace __gnu_cxx;
79 keybindings global_bindings;
81 --- aptitude-0.2.11.1/src/vscreen/config/keybindings.h.orig Sat Mar 16 04:40:13 2002
82 +++ aptitude-0.2.11.1/src/vscreen/config/keybindings.h Sun Jan 19 14:26:47 2003
87 - std::hash_map<std::string, keybinding> keymap;
88 + __gnu_cxx::hash_map<std::string, keybinding> keymap;
93 keybinding get(std::string tag)
94 // Returns the keybinding for the given string. Almost never needed.
96 - std::hash_map<std::string, keybinding>::iterator found=keymap.find(tag);
97 + __gnu_cxx::hash_map<std::string, keybinding>::iterator found=keymap.find(tag);
99 if(found==keymap.end())
101 --- aptitude-0.2.11.1/src/vscreen/vs_subtree.h.orig Sat Apr 6 22:38:38 2002
102 +++ aptitude-0.2.11.1/src/vscreen/vs_subtree.h Sun Jan 19 14:43:56 2003
106 typedef list<childtype *> child_list;
107 - typedef child_list::iterator child_iterator;
108 + typedef typename child_list::iterator child_iterator;
110 class levelref:public vs_tree_levelref
112 --- aptitude-0.2.11.1/src/vscreen/vs_treeitem.cc.orig Sat Mar 16 04:40:13 2002
113 +++ aptitude-0.2.11.1/src/vscreen/vs_treeitem.cc Sun Jan 19 14:30:23 2003
117 void vs_treeitem::paint(vs_tree *win, int y, bool hierarchical, string str,
119 + int depth_shift /* =2 */)
122 int basex=hierarchical?depth_shift*get_depth():0;
123 --- aptitude-0.2.11.1/src/vscreen/vs_util.cc.orig Thu Nov 22 15:26:18 2001
124 +++ aptitude-0.2.11.1/src/vscreen/vs_util.cc Sun Jan 19 14:30:51 2003
128 vscreen_widget *vs_dialog_fileview(string fn,
129 - Slot0Arg okslot=NULL)
130 + Slot0Arg okslot /* =NULL */)
132 return vs_dialog_fileview(fn, okslot,
133 get_color("DefaultWidgetBackground")|A_REVERSE);
134 --- aptitude-0.2.11.1/src/dep_item.cc.orig Sun Mar 24 19:50:17 2002
135 +++ aptitude-0.2.11.1/src/dep_item.cc Sun Jan 19 14:47:14 2003
137 set_root(setup_new_root(pkg, ver), true);
140 -typedef hash_map<string, pkg_subtree *> tree_map;
141 +typedef __gnu_cxx::hash_map<string, pkg_subtree *> tree_map;
143 template<class tree_type>
144 void setup_package_deps(const pkgCache::PkgIterator &pkg,
145 --- aptitude-0.2.11.1/src/download_screen.h.orig Sat Mar 16 04:40:11 2002
146 +++ aptitude-0.2.11.1/src/download_screen.h Sun Jan 19 14:48:52 2003
150 #if defined(HAVE_HASH_MAP) || defined(HAVE_EXT_HASH_MAP)
152 +namespace __gnu_cxx {
155 size_t operator()(void * __x) const { return (size_t) __x; }
158 class download_screen:public vs_tree, public pkgAcquireStatus
160 - typedef std::hash_map<void *, download_item *> downloadmap;
161 + typedef __gnu_cxx::hash_map<void *, download_item *> downloadmap;
162 downloadmap active_items;
163 // Makes it easy to find a currently downloading item when we get a hit
165 --- aptitude-0.2.11.1/src/edit_pkg_hier.cc.orig Fri Sep 14 23:32:49 2001
166 +++ aptitude-0.2.11.1/src/edit_pkg_hier.cc Sun Jan 19 14:49:41 2003
168 #include <vscreen/vs_subtree.h>
171 +using namespace __gnu_cxx;
173 // Stores a group (name) and a Y/N state
174 class vs_hier_editor::vs_hier_item:public SigC::Object, public vs_treeitem
175 --- aptitude-0.2.11.1/src/pkg_grouppolicy.cc.orig Sat Apr 6 22:42:00 2002
176 +++ aptitude-0.2.11.1/src/pkg_grouppolicy.cc Sun Jan 19 14:52:08 2003
181 +using namespace __gnu_cxx;
183 // This special tree munges its tag to allow an integer to be prepended to it.
184 // Ok, it's a dreadful hack. I admit it.