diff options
| author | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-08 05:34:33 +0000 |
|---|---|---|
| committer | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-08 05:34:33 +0000 |
| commit | cb062111c24b8f715b21a9cb862d210c1f1015e8 (patch) | |
| tree | e5024acc2c4f07ece5019cc5f16db6068366284c /ppapi/generators | |
| parent | 41feae71f049ea090a7a7f587b13e22596204bd1 (diff) | |
| download | chromium_src-cb062111c24b8f715b21a9cb862d210c1f1015e8.zip chromium_src-cb062111c24b8f715b21a9cb862d210c1f1015e8.tar.gz chromium_src-cb062111c24b8f715b21a9cb862d210c1f1015e8.tar.bz2 | |
Change IDL shim/wrapper generator to use version numbers in struct names.
This is to match recent changes in the PPAPI generated headers in the following change:
http://codereview.chromium.org/8989006/
R=noelallen@chromium.org,mcgrathr@chromium.org
BUG= none
TEST= compile the pnacl irt shim and use it in a test.
Review URL: http://codereview.chromium.org/9110045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/generators')
| -rw-r--r-- | ppapi/generators/idl_gen_wrapper.py | 3 | ||||
| -rw-r--r-- | ppapi/generators/test_gen_pnacl/test_interfaces.idl | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ppapi/generators/idl_gen_wrapper.py b/ppapi/generators/idl_gen_wrapper.py index 0f3cec8..6d4b74a 100644 --- a/ppapi/generators/idl_gen_wrapper.py +++ b/ppapi/generators/idl_gen_wrapper.py @@ -230,9 +230,8 @@ const void *__%(wrapper_prefix)s_PPPGetInterface(const char *name) { releases_for_iface = iface.GetUniqueReleases(releases) for release in releases_for_iface: version = iface.GetVersion(release) - not_latest = release != releases_for_iface[-1] struct_name = self.cgen.GetStructName(iface, release, - include_version=not_latest) + include_version=True) needs_wrap = self.InterfaceVersionNeedsWrapping(iface, version) if not needs_wrap: InfoOut.Log('Interface %s ver %s does not need wrapping' % diff --git a/ppapi/generators/test_gen_pnacl/test_interfaces.idl b/ppapi/generators/test_gen_pnacl/test_interfaces.idl index 731fce0..78c21eb 100644 --- a/ppapi/generators/test_gen_pnacl/test_interfaces.idl +++ b/ppapi/generators/test_gen_pnacl/test_interfaces.idl @@ -39,8 +39,8 @@ struct some_struct2 { /* * static __attribute__((pnaclcall)) int32_t * Pnacl_M15_PPB_Iface_struct_wrap_foo1(int32_t a, struct some_struct b) { - * const struct PPB_Iface_struct_wrap *iface = - * Pnacl_WrapperInfo_PPB_Iface_struct_wrap.real_iface; + * const struct PPB_Iface_struct_wrap_2_0 *iface = + * Pnacl_WrapperInfo_PPB_Iface_struct_wrap_2_0.real_iface; * return iface->foo1(a, b); * } */ @@ -52,8 +52,8 @@ interface PPB_Iface_struct_wrap { /* * static __attribute__((pnaclcall)) int32_t * Pnacl_M15_PPB_Iface_union_wrap_foo1(int32_t a, union some_union b) { - * const struct PPB_Iface_union_wrap *iface = - * Pnacl_WrapperInfo_PPB_Iface_union_wrap.real_iface; + * const struct PPB_Iface_union_wrap_2_0 *iface = + * Pnacl_WrapperInfo_PPB_Iface_union_wrap_2_0.real_iface; * return iface->foo1(a, b); * } */ |