summaryrefslogtreecommitdiff
path: root/glib/src/variant.hg
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2014-04-03 10:56:31 +0200
committerMurray Cumming <murrayc@murrayc.com>2014-04-03 10:56:31 +0200
commitca67c931dd24a27bb5bb9de56abb6cf6fcb28018 (patch)
tree1ee83cc254ffa85a98fb51403d4b4a6689d37ccf /glib/src/variant.hg
parentb1952db2640f12817eb11266eedb640e29c0c399 (diff)
downloadglibmm-ca67c931dd24a27bb5bb9de56abb6cf6fcb28018.tar.gz
Add Glib::VariantDict, needed for GApplication.
* glib/src/filelist.am: * glib/src/variantdict.[hg|ccg]: Add it as a generic refcounted type, with templated lookup_value() and insert_value() methods, though these are completely untested so far. * glib/src/variant.hg: Ignore a g_variant_dict_* function that gmmproc thinks is part of Variant. * tools/m4/convert_gio.m4: * tools/m4/convert_glib.m4: Move all Variant* conversion to the glib conversions and add a necessary one. * glib/glibmm.h: Include variantdict.h.
Diffstat (limited to 'glib/src/variant.hg')
-rw-r--r--glib/src/variant.hg2
1 files changed, 2 insertions, 0 deletions
diff --git a/glib/src/variant.hg b/glib/src/variant.hg
index 1ab266e7..9c9e6860 100644
--- a/glib/src/variant.hg
+++ b/glib/src/variant.hg
@@ -210,6 +210,8 @@ public:
template<class V_CastTo>
static V_CastTo cast_dynamic(const VariantBase& v) throw(std::bad_cast);
+ _IGNORE(g_variant_dict_new)
+
private:
/** Relational operators are deleted to prevent invalid conversion
* to const void*.