diff options
author | David Robillard <d@drobilla.net> | 2012-05-17 01:39:54 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-05-17 01:39:54 +0000 |
commit | 67875ae2cd950aeb57e4dda999b7a7b06e6435fb (patch) | |
tree | b115826c68f769bc227daf8c528d0e7caee8aa9c /lv2/lv2plug.in/ns/ext/atom | |
parent | 135822dd47be1b8f11c751c019136b9c126d2180 (diff) | |
download | lv2-67875ae2cd950aeb57e4dda999b7a7b06e6435fb.tar.xz |
Fix implicit conversions in forge.h that are invalid in C++11.
Diffstat (limited to 'lv2/lv2plug.in/ns/ext/atom')
-rw-r--r-- | lv2/lv2plug.in/ns/ext/atom/atom.ttl | 8 | ||||
-rw-r--r-- | lv2/lv2plug.in/ns/ext/atom/forge.h | 5 | ||||
-rw-r--r-- | lv2/lv2plug.in/ns/ext/atom/manifest.ttl | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/lv2/lv2plug.in/ns/ext/atom/atom.ttl b/lv2/lv2plug.in/ns/ext/atom/atom.ttl index ba7b00c..546c7b8 100644 --- a/lv2/lv2plug.in/ns/ext/atom/atom.ttl +++ b/lv2/lv2plug.in/ns/ext/atom/atom.ttl @@ -22,6 +22,14 @@ doap:created "2007-00-00" ; doap:developer <http://drobilla.net/drobilla#me> ; doap:release [ + doap:revision "1.1" ; + dcs:blame <http://drobilla.net/drobilla#me> ; + dcs:changeset [ + dcs:item [ + rdfs:label "Fix implicit conversions in forge.h that are invalid in C++11." + ] + ] + ] , [ doap:revision "1.0" ; doap:created "2012-04-17" ; doap:file-release <http://lv2plug.in/spec/lv2-1.0.0.tar.bz2> ; diff --git a/lv2/lv2plug.in/ns/ext/atom/forge.h b/lv2/lv2plug.in/ns/ext/atom/forge.h index f86d9a8..7cc9b31 100644 --- a/lv2/lv2plug.in/ns/ext/atom/forge.h +++ b/lv2/lv2plug.in/ns/ext/atom/forge.h @@ -426,7 +426,7 @@ lv2_atom_forge_literal(LV2_Atom_Forge* forge, uint32_t lang) { const LV2_Atom_Literal a = { - { sizeof(LV2_Atom_Literal) - sizeof(LV2_Atom) + len + 1, + { (uint32_t)(sizeof(LV2_Atom_Literal) - sizeof(LV2_Atom) + len + 1), forge->Literal }, { datatype, lang } @@ -466,7 +466,8 @@ lv2_atom_forge_vector(LV2_Atom_Forge* forge, const void* elems) { const LV2_Atom_Vector a = { - { sizeof(LV2_Atom_Vector_Body) + n_elems * child_size, forge->Vector }, + { (uint32_t)(sizeof(LV2_Atom_Vector_Body) + n_elems * child_size), + forge->Vector }, { child_size, child_type } }; LV2_Atom_Forge_Ref out = lv2_atom_forge_write(forge, &a, sizeof(a)); diff --git a/lv2/lv2plug.in/ns/ext/atom/manifest.ttl b/lv2/lv2plug.in/ns/ext/atom/manifest.ttl index 178911e..1d7c0c3 100644 --- a/lv2/lv2plug.in/ns/ext/atom/manifest.ttl +++ b/lv2/lv2plug.in/ns/ext/atom/manifest.ttl @@ -4,5 +4,5 @@ <http://lv2plug.in/ns/ext/atom> a lv2:Specification ; lv2:minorVersion 1 ; - lv2:microVersion 0 ; + lv2:microVersion 1 ; rdfs:seeAlso <atom.ttl> . |