1 files changed, 12 insertions, 12 deletions

diff --git a/src/embind/emval.js b/src/embind/emval.js
index 24c42c3d..4007701a 100644
--- a/src/embind/emval.js
+++ b/src/embind/emval.js
@@ -108,7 +108,7 @@ function __emval_new_cstring(v) {
 
 function __emval_take_value(type, argv) {
     type = requireRegisteredType(type, '_emval_take_value');
-    var v = type['readValueFromVarArg'](argv);
+    var v = type['readValueFromPointer'](argv);
     return __emval_register(v);
 }
 
@@ -119,11 +119,11 @@ function craftEmvalAllocator(argCount) {
     /*This function returns a new function that looks like this:
     function emval_allocator_3(constructor, argTypes, args) {
         var argType0 = requireRegisteredType(HEAP32[(argTypes >> 2)], "parameter 0");
-        var arg0 = argType0.readValueFromVarArg(args);
+        var arg0 = argType0.readValueFromPointer(args);
         var argType1 = requireRegisteredType(HEAP32[(argTypes >> 2) + 1], "parameter 1");
-        var arg1 = argType1.readValueFromVarArg(args + 8);
+        var arg1 = argType1.readValueFromPointer(args + 8);
         var argType2 = requireRegisteredType(HEAP32[(argTypes >> 2) + 2], "parameter 2");
-        var arg2 = argType2.readValueFromVarArg(args + 16);
+        var arg2 = argType2.readValueFromPointer(args + 16);
         var obj = new constructor(arg0, arg1, arg2);
         return __emval_register(obj);
     } */
@@ -137,10 +137,10 @@ function craftEmvalAllocator(argCount) {
         "return function emval_allocator_"+argCount+"(constructor, argTypes, args) {\n";
 
     for(var i = 0; i < argCount; ++i) {
-        functionBody += 
+        functionBody +=
             "var argType"+i+" = requireRegisteredType(HEAP32[(argTypes >> 2) + "+i+"], \"parameter "+i+"\");\n" +
-            "var arg"+i+" = argType"+i+".readValueFromVarArg(args);\n" +
-            "args += argType"+i+".varArgAdvance;\n";
+            "var arg"+i+" = argType"+i+".readValueFromPointer(args);\n" +
+            "args += argType"+i+".argPackAdvance;\n";
     }
     functionBody +=
         "var obj = new constructor("+argsList+");\n" +
@@ -154,7 +154,7 @@ function craftEmvalAllocator(argCount) {
 
 function __emval_new(handle, argCount, argTypes, args) {
     handle = requireHandle(handle);
-    
+
     var newer = __newers[argCount];
     if (!newer) {
         newer = craftEmvalAllocator(argCount);
@@ -206,8 +206,8 @@ function __emval_call(handle, argCount, argTypes, argv) {
     var args = new Array(argCount);
     for (var i = 0; i < argCount; ++i) {
         var type = types[i];
-        args[i] = type['readValueFromVarArg'](argv);
-        argv += type.varArgAdvance;
+        args[i] = type['readValueFromPointer'](argv);
+        argv += type.argPackAdvance;
     }
 
     var rv = handle.apply(undefined, args);
@@ -261,8 +261,8 @@ function __emval_get_method_caller(argCount, argTypes) {
 
     for (var i = 0; i < argCount - 1; ++i) {
         functionBody +=
-        "    var arg" + i + " = argType" + i + ".readValueFromVarArg(args);\n" +
-        "    args += argType" + i + ".varArgAdvance;\n";
+        "    var arg" + i + " = argType" + i + ".readValueFromPointer(args);\n" +
+        "    args += argType" + i + ".argPackAdvance;\n";
     }
     functionBody +=
         "    var rv = handle[name](" + argsList + ");\n" +