--- OpenCL/typemap	2012/05/04 14:49:42	1.15
+++ OpenCL/typemap	2012/05/05 02:45:38	1.17
@@ -41,6 +41,9 @@
 cl_kernel_info			T_UV
 cl_kernel_work_group_info	T_UV
 cl_kernel_arg_info		T_UV
+cl_kernel_arg_address_qualifier	T_UV
+cl_kernel_arg_access_qualifier	T_UV
+cl_kernel_arg_type_qualifier	T_UV
 cl_command_type			T_UV
 cl_mem_migration_flags		T_UV
 
@@ -75,25 +78,19 @@
 
 OpenCL::Mapped		mapped
 
-FUTURE			future
-
 INPUT
 
-future
-	if (SvOK ($arg))
-	  croak (\"$pname argument '$var' is reserved for future extensions, it must be missing or undef in this implementation, in call\");
-
 context_properties
-	$var = SvCONTEXTPROPERTIES (${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]}, \"$var\", $arg, 0, 0)
+	$var = SvCONTEXTPROPERTIES (cv, \"$var\", $arg, 0, 0)
 
 clobj
-	$var = ($type)SvCLOBJ (${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]}, \"$var\", $arg, \"${ntype}\")
+	$var = ($type)SvCLOBJ (cv, \"$var\", $arg, \"${ntype}\")
 
 clobj_ni
-	$var = ($type)SvCLOBJ_ni (${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]}, \"$var\", $arg, stash_${(my $x = $ntype) =~ s/OpenCL:://; \lc $x})
+	$var = ($type)SvCLOBJ_ni (cv, \"$var\", $arg, stash_${(my $x = $ntype) =~ s/OpenCL:://; \lc $x})
 
 clobj_ornull
-	$var = SvOK ($arg) ? ($type)SvCLOBJ (${$ALIAS?\q[GvNAME(CvGV(cv))]:\qq[\"$pname\"]}, \"$var\", $arg, \"${\substr $ntype, 0, -7}\") : 0
+	$var = SvOK ($arg) ? ($type)SvCLOBJ (cv, \"$var\", $arg, \"${\substr $ntype, 0, -7}\") : 0
 
 mapped
 	$var = SvMAPPED ($arg);