[vala/wip/merge-valadoc] libvaladoc: HashMap doesn't allow null keys
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/wip/merge-valadoc] libvaladoc: HashMap doesn't allow null keys
- Date: Sun, 4 Jun 2017 10:30:54 +0000 (UTC)
commit 8b4dc3f1f182efc0f86b84476d0ef2c3b4896a35
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sun Jun 4 12:29:50 2017 +0200
libvaladoc: HashMap doesn't allow null keys
libvaladoc/api/package.vala | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/libvaladoc/api/package.vala b/libvaladoc/api/package.vala
index e2d9603..821230e 100644
--- a/libvaladoc/api/package.vala
+++ b/libvaladoc/api/package.vala
@@ -81,11 +81,15 @@ public class Valadoc.Api.Package : Node {
}
// <version, symbols>
- private Vala.HashMap<string?, Vala.ArrayList<Symbol>> deprecated;
+ private Vala.HashMap<string, Vala.ArrayList<Symbol>> deprecated;
internal void register_deprecated_symbol (Symbol symbol, string? version) {
if (deprecated == null) {
- deprecated = new Vala.HashMap<string?, Vala.ArrayList<Symbol>> (str_hash, str_equal);
+ deprecated = new Vala.HashMap<string, Vala.ArrayList<Symbol>> (str_hash, str_equal);
+ }
+
+ if (version == null) {
+ version = "0xdeadbeef";
}
Vala.ArrayList<Symbol> list = deprecated.get (version);
@@ -97,9 +101,9 @@ public class Valadoc.Api.Package : Node {
list.add (symbol);
}
- public Vala.Map<string?, Vala.Collection<Symbol>> get_deprecated_symbols () {
+ public Vala.Map<string, Vala.Collection<Symbol>> get_deprecated_symbols () {
if (deprecated == null) {
- return new Vala.HashMap<string?, Vala.Collection<Symbol>> (str_hash, str_equal);
+ return new Vala.HashMap<string, Vala.Collection<Symbol>> (str_hash, str_equal);
}
return deprecated;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]