1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
Description: build against libgee-0.8
Debian will remove support for old libgee
releases, so we build against libgee-0.8.
Author: Sebastian Reichel <sre@ring0.de>
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@
libxml-2.0
glib-2.0 >= $GLIB_REQUIRED
gobject-2.0 >= $GLIB_REQUIRED
- gee-1.0 >= $GEE_REQUIRED)
+ gee-0.8 >= $GEE_REQUIRED)
AC_SUBST(DEPS_CFLAGS)
AC_SUBST(DEPS_LIBS)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@
--vapidir $(top_srcdir)/vapi \
--pkg config \
--pkg glib-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg libxml-2.0
LDADD = \
--- a/src/vala-dbus-binding-tool.vala
+++ b/src/vala-dbus-binding-tool.vala
@@ -26,14 +26,14 @@
public GeneratedNamespace parent;
public string name;
public Gee.Map<string, Xml.Node*> members
- = new Gee.HashMap<string, Xml.Node*>(str_hash, str_equal, direct_equal);
+ = new Gee.HashMap<string, Xml.Node*>();
public Gee.Map<string, GeneratedNamespace> namespaces
- = new Gee.HashMap<string, GeneratedNamespace>(str_hash, str_equal, direct_equal);
+ = new Gee.HashMap<string, GeneratedNamespace>();
}
public class BindingGenerator : Object {
- private static Set<string> registered_names = new HashSet<string>(str_hash, str_equal);
+ private static Set<string> registered_names = new HashSet<string>();
private static int verbosity;
private static int errors;
private static bool synced;
@@ -94,7 +94,7 @@
uint dbus_timeout = 120000;
synced = true;
- Map<string,string> namespace_renaming = new HashMap<string,string>(str_hash, str_equal, str_equal);
+ Map<string,string> namespace_renaming = new HashMap<string,string>();
for (int i = 1; i < args.length; i++) {
string arg = args[i];
@@ -432,8 +432,8 @@
private GeneratedNamespace root_namespace = new GeneratedNamespace();
- private Map<string, string> name_index = new HashMap<string, string>(str_hash, str_equal, str_equal);
- private Map<string, string> error_name_index = new HashMap<string, string>(str_hash, str_equal, str_equal);
+ private Map<string, string> name_index = new HashMap<string, string>();
+ private Map<string, string> error_name_index = new HashMap<string, string>();
private void generate_namespace(GeneratedNamespace ns)
throws GeneratorError {
@@ -487,7 +487,7 @@
}
private Gee.Map<string, string> structs_to_generate
- = new Gee.HashMap<string, string>(str_hash, str_equal, str_equal);
+ = new Gee.HashMap<string, string>();
private void generate_interface(string interface_name, Xml.Node* node, Synchrony synchrony = Synchrony.AUTO)
throws GeneratorError {
|
