Move x.type() to typeid(x) and implement variadic.

[cycript.git] / ObjectiveC / Internal.hpp

diff --git a/ObjectiveC/Internal.hpp b/ObjectiveC/Internal.hpp
index 1ac20e2e0f64d42ff7422d23b4c879ba0724a66d..9cffb48ece8086176a42a0cb867b156990564615 100644 (file)
--- a/ObjectiveC/Internal.hpp
+++ b/ObjectiveC/Internal.hpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -22,9 +22,10 @@
 #ifndef CYCRIPT_OBJECTIVEC_INTERNAL_HPP
 #define CYCRIPT_OBJECTIVEC_INTERNAL_HPP
 
-#include <Internal.hpp>
 #include <objc/objc.h>
 
+#include "../Internal.hpp"
+
 struct Selector_privateData :
     CYValue
 {
@@ -45,7 +46,7 @@ struct Instance :
 {
     enum Flags {
         None          = 0,
-        Transient     = (1 << 0),
+        Permanent     = (1 << 0),
         Uninitialized = (1 << 1),
     };
 
@@ -79,7 +80,7 @@ struct Super :
     Class class_;
 
     _finline Super(id value, Class _class) :
-        Instance(value, Instance::Transient),
+        Instance(value, Instance::Permanent),
         class_(_class)
     {
     }