CYONify the contents of a JavaMethod override set.

[cycript.git] / JavaScript.hpp

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 47a9618e0306c22a1a04c86173b50ddd1310f983..fcefd7bcf78b75048e739ff24cd9bb28ea4c8f69 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -39,6 +39,7 @@
 
 #include "Pooling.hpp"
 #include "String.hpp"
+#include "Utility.hpp"
 
 extern JSStringRef Array_s;
 extern JSStringRef constructor_s;
@@ -69,7 +70,7 @@ const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code);
 void CYCancel();
 #endif
 
-void CYSetArgs(int argc, const char *argv[]);
+void CYSetArgs(const char *argv0, const char *script, int argc, const char *argv[]);
 
 bool CYCastBool(JSContextRef context, JSValueRef value);
 double CYCastDouble(JSContextRef context, JSValueRef value);
@@ -194,15 +195,9 @@ class CYJSString {
     {
     }
 
-    template <typename Arg0_>
-    CYJSString(Arg0_ arg0) :
-        string_(CYCopyJSString(arg0))
-    {
-    }
-
-    template <typename Arg0_, typename Arg1_>
-    CYJSString(Arg0_ arg0, Arg1_ arg1) :
-        string_(CYCopyJSString(arg0, arg1))
+    template <typename ...Args_>
+    CYJSString(Args_ &&... args) :
+        string_(CYCopyJSString(cy::Forward<Args_>(args)...))
     {
     }