summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorCarl Olsson <carl.olsson@gmail.com>2015-01-19 23:07:25 +1000
committerCarl Olsson <carl.olsson@gmail.com>2015-01-19 23:07:25 +1000
commita8b318871c016a9ece8964daf02f4e85d31824ad (patch)
tree1f0ce16f5e1a58bdcaccaf5fa9fc077b307078d2 /core
parenta0511ed59a0e03232bf3abb49b3c916591453aef (diff)
Prep for tile transpose transform.
Diffstat (limited to 'core')
-rw-r--r--core/object.h14
-rw-r--r--core/variant.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/core/object.h b/core/object.h
index 97ca50cb1a..3c493de157 100644
--- a/core/object.h
+++ b/core/object.h
@@ -35,13 +35,13 @@
#include "map.h"
#include "vmap.h"
-#define VARIANT_ARG_LIST const Variant& p_arg1=Variant(),const Variant& p_arg2=Variant(),const Variant& p_arg3=Variant(),const Variant& p_arg4=Variant(),const Variant& p_arg5=Variant()
-#define VARIANT_ARG_PASS p_arg1,p_arg2,p_arg3,p_arg4,p_arg5
-#define VARIANT_ARG_DECLARE const Variant& p_arg1,const Variant& p_arg2,const Variant& p_arg3,const Variant& p_arg4,const Variant& p_arg5
-#define VARIANT_ARG_MAX 5
-#define VARIANT_ARGPTRS const Variant *argptr[5]={&p_arg1,&p_arg2,&p_arg3,&p_arg4,&p_arg5};
-#define VARIANT_ARGPTRS_PASS *argptr[0],*argptr[1],*argptr[2],*argptr[3],*argptr[4]
-#define VARIANT_ARGS_FROM_ARRAY(m_arr) m_arr[0],m_arr[1],m_arr[2],m_arr[3],m_arr[4]
+#define VARIANT_ARG_LIST const Variant& p_arg1=Variant(),const Variant& p_arg2=Variant(),const Variant& p_arg3=Variant(),const Variant& p_arg4=Variant(),const Variant& p_arg5=Variant(),const Variant& p_arg6=Variant()
+#define VARIANT_ARG_PASS p_arg1,p_arg2,p_arg3,p_arg4,p_arg5,p_arg6
+#define VARIANT_ARG_DECLARE const Variant& p_arg1,const Variant& p_arg2,const Variant& p_arg3,const Variant& p_arg4,const Variant& p_arg5,const Variant& p_arg6
+#define VARIANT_ARG_MAX 6
+#define VARIANT_ARGPTRS const Variant *argptr[6]={&p_arg1,&p_arg2,&p_arg3,&p_arg4,&p_arg5,&p_arg6};
+#define VARIANT_ARGPTRS_PASS *argptr[0],*argptr[1],*argptr[2],*argptr[3],*argptr[4],*argptr[5]
+#define VARIANT_ARGS_FROM_ARRAY(m_arr) m_arr[0],m_arr[1],m_arr[2],m_arr[3],m_arr[4],m_arr[5]
/**
@author Juan Linietsky <reduzio@gmail.com>
diff --git a/core/variant.h b/core/variant.h
index 47fc3f43ac..a3efc34452 100644
--- a/core/variant.h
+++ b/core/variant.h
@@ -387,7 +387,7 @@ public:
};
Variant call(const StringName& p_method,const Variant** p_args,int p_argcount,CallError &r_error);
- Variant call(const StringName& p_method,const Variant& p_arg1=Variant(),const Variant& p_arg2=Variant(),const Variant& p_arg3=Variant(),const Variant& p_arg4=Variant(),const Variant& p_arg5=Variant());
+ Variant call(const StringName& p_method,const Variant& p_arg1=Variant(),const Variant& p_arg2=Variant(),const Variant& p_arg3=Variant(),const Variant& p_arg4=Variant(),const Variant& p_arg5=Variant(),const Variant& p_arg6=Variant());
static Variant construct(const Variant::Type,const Variant** p_args,int p_argcount,CallError &r_error);
void get_method_list(List<MethodInfo> *p_list) const;